X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=108ce6b95a8e6e3de045dd33818e330725a9cb5b;hb=a3d195e845a4547ff5ae88049796290b0e6078ef;hp=99d1ea3c1207807436987a2a62468c835eab2fb3;hpb=a68089fb83a276f3ce78e5bd145c1cf05cc9a762;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 99d1ea3c1..108ce6b95 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -64,6 +64,10 @@ bind_password =
 # Set language for login and admin forms. Currently "de" (German)
 # and "en" (English, not perfect) are available.
 language = de
+# MassPrint Timeout
+# must be less than cgi timeout
+#
+massprint_timeout = 30
 
 # Set default_manager for admin forms. Currently "german"
 # and "swiss" are available.
@@ -98,6 +102,12 @@ memberfile = users/members
 # if set the export to geierlein is enabled
 # geierlein_path = geierlein
 
+#
+# document path for FileSystem FileManagement:
+#  (must be reachable read/write but not executable from webserver)
+# document_path = /var/local/kivi_documents
+#
+
 [mail_delivery]
 # Delivery method can be 'sendmail' or 'smtp'. For 'method = sendmail' the
 # parameter 'mail_delivery.sendmail' is used as the executable to call. If
@@ -246,12 +256,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.
@@ -294,6 +306,8 @@ dbix_log4perl_config = log4perl.logger = FATAL, LOGFILE
 #   REQUEST            - Log each request. Careful! Passwords get filtered, but
 #                        there may be confidential information being logged here
 #   WARN               - warnings
+#   SHOW_CALLER        - include the file name & line number from where a call
+#                        to "message" or "dump" was called
 #   ALL                - all possible debug messages
 #
 #   DEVEL              - sames as "INFO QUERY TRACE BACKTRACE_ON_ERROR REQUEST_TIMER"