X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=3fb87cdf2d0a9b32ae493c47255346ee86af3252;hb=76273adac85df187367d7f2c60ae5f018915a969;hp=4e4919d50db6b1414ee27fbe1a0460cf90f1073d;hpb=2b96805c82afc5fa9f7678815ef6d537dd5cfed6;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 4e4919d50..3fb87cdf2 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -132,13 +132,6 @@ latex = pdflatex
 # into binaries located in different locations than the main Python
 # binary.
 python_uno = python
-# Location of the two executables "pg_dump" and "pg_restore" used for
-# database backup and restoration from the admin section.  If
-# "pg_dump" or "pg_restore" is set to "DISABLED" then the
-# corresponding option (backup/restoration) will be hidden from the
-# admin section.
-pg_dump = pg_dump
-pg_restore = pg_restore
 
 [environment]
 # Add the following paths to the PATH environment variable.
@@ -166,7 +159,11 @@ openofficeorg_daemon = 1
 openofficeorg_daemon_port = 2002
 
 [task_server]
-# User name to use for database access
+# kivitendo client (either its name or its database ID) for database
+# access (both 'client' and 'login' are required)
+client =
+# kivitendo user (login) name to use for certain jobs (both 'client'
+# and 'login' are required)
 login =
 # Set to 1 for debug messages in /tmp/kivitendo-debug.log
 debug = 0
@@ -208,7 +205,10 @@ email_subject  = kivitendo self test report
 email_template = templates/mail/self_test/status_mail.txt
 
 [console]
-# autologin to use if none is given
+# Automatic login will only work if both "client" and "login" are
+# given.  "client" can be a client's database ID or its name. "login"
+# is simply a user's login name.
+client =
 login =
 
 # autorun lines will be executed after autologin.
@@ -226,9 +226,19 @@ history_file = users/console_history
 log_file = /tmp/kivitendo_console_debug.log
 
 [testing]
+# Automatic login will only work if both "client" and "login" are
+# given.  "client" can be a client's database ID or its name. "login"
+# is simply a user's login name.
+client =
+login =
+
+[devel]
+# Several settings related to the development of kivitendo.
 
-# autologin to use if none is given
-login = myxplace_standard
+# "client" is used by several scripts (e.g. rose_auto_create_model.pl)
+# when they need access to the database. It can be either a client's
+# database ID or its name.
+client =
 
 [debug]
 # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE
@@ -301,3 +311,6 @@ keep_installation_unlocked = 0
 # be made unique by appending a random GET parameter. This will cause
 # the web browser to always reload the resources.
 auto_reload_resources = 0
+
+# If set to 1 each exception will include a full stack backtrace.
+backtrace_on_die = 0