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

diff --git a/SL/User.pm b/SL/User.pm
index 37a61c51f416d4f58c8a853ea45d1f84dce76612..368a0a278ef869b75fc6f999c5bb1db64ab48742 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -149,7 +149,7 @@ sub login {
       }
 
       # update the tables
       }
 
       # 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}),
         $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;
 }
 
 1;

-

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 1391239f8cc1363c908f7c4efacef05abd61dc50..51e7456fba7473f0c065e19e844dc4d47abce205 100644 (file)
--- 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
 
 # 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