X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=0715dc08705d6cb866b12c361fe2091396da2949;hb=543d78225ec609;hp=60be4b326738606ee18e339afcc0bc0747ef409d;hpb=bf980f4c7394345e77711c389c1b3b1c3c764213;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 60be4b326..0715dc087 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -80,8 +80,14 @@ default_manager = german
 # processes). If either limit is reached at the end of the request
 # then the kivitendo process will exit.
 #
-# This only makes sense when running under FCGI. The FCGI manager will
-# then automatically start a new process.
+# This only applies for processes under FCGI and the task manager.
+# For CGI configurations the process will be terminated after each request
+# regardless of this setting.
+#
+# Note: this will only terminate processes with too high memory consumption. It
+# is assumed that an external managing service will start new instances. For
+# FCGI this will usually be apache or the wrapper scripts for nginx, for the
+# task server this will have to be the system manager.
 #
 # Numbers can be postfixed with KB, MB, GB. If no number is given or
 # the number is 0 then no checking will be performed.
@@ -256,12 +262,14 @@ log_file = /tmp/kivitendo_console_debug.log
 # database will be dropped & created before any other test is run. The
 # following parameters must be given:
 [testing/database]
-host     = localhost
-port     = 5432
-db       =
-user     = postgres
-password =
-template = template1
+host               = localhost
+port               = 5432
+db                 =
+user               = postgres
+password           =
+template           = template1
+superuser_user     = postgres
+superuser_password =
 
 [devel]
 # Several settings related to the development of kivitendo.
@@ -368,3 +376,5 @@ dial_command =
 external_prefix = 0
 # The prefix for international calls (numbers starting with +).
 international_dialing_prefix = 00
+# Our own country code
+our_country_code = 49