From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 14 Jan 2013 14:43:22 +0000 (+0100)
Subject: Option in [debug], keine 'nologin' zu schreiben
X-Git-Tag: release-3.1.0beta1~700
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ca0556190d6b60e628d9b07b19f8af10960ba25f;p=kivitendo-erp.git

Option in [debug], keine 'nologin' zu schreiben
---

diff --git a/SL/User.pm b/SL/User.pm
index 37a61c51f..368a0a278 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -149,7 +149,7 @@ sub login {
       }
 
       # update the tables
-      if (!open(FH, ">", $::lx_office_conf{paths}->{userspath} . "/nologin")) {
+      if (!$::lx_office_conf{debug}->{keep_installation_unlocked} && !open(FH, ">", $::lx_office_conf{paths}->{userspath} . "/nologin")) {
         $form->show_generic_error($main::locale->text('A temporary file could not be created. ' .
                                                       'Please verify that the directory "#1" is writeable by the webserver.',
                                                       $::lx_office_conf{paths}->{userspath}),
@@ -783,4 +783,3 @@ sub data {
 }
 
 1;
-
diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 1391239f8..51e7456fb 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -293,3 +293,7 @@ restart_fcgi_process_on_changes = 0
 
 # The file name where the debug messages are written to.
 file_name = /tmp/kivitendo-debug.log
+
+# If set to 1 then the installation will be kept unlocked even if a
+# database upgrade fails.
+keep_installation_unlocked = 0