X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=120b6f41bdd39303d9b937b3dcd338acbc68e1ea;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=0352b4371680febb28650465b9bc34229612abdd;hpb=57a728bd60e04fd586a5546e71603bf91645404f;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 0352b4371..120b6f41b 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -65,22 +65,24 @@ bind_password =
 # and "en" (English, not perfect) are available.
 language = de
 
-# The database charset. Must match the encoding of the database cluster you want to
-# connect to. (Used on the shell command to create a database "pg_createcluster". Option "-e <encoding>".)
-dbcharset = UTF-8
-
-[features]
-# Activate certain optional features and modules.
-webdav = 0
-vertreter = 0
-
-## Pictures for parts
-# Show the picture in the part form
-parts_show_image = 1
-# Style the picture with the following CSS code:
-parts_image_css = border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;
-# Show the picture in the results when you search for parts
-parts_listing_images = 0
+# Set default_manager for admin forms. Currently "german"
+# and "swiss" are available.
+default_manager = german
+
+# The memory limits given here determine the maximum process size
+# (vsz, the total amount of memory this process uses including memory
+# swapped out or shared with other processes) or resident set size
+# (rss, the amount of memory not swapped out/shared with other
+# 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.
+#
+# Numbers can be postfixed with KB, MB, GB. If no number is given or
+# the number is 0 then no checking will be performed.
+memory_limit_rss =
+memory_limit_vsz =
 
 [paths]
 # path to temporary files (must be writeable by the web server)
@@ -132,13 +134,10 @@ 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
+
+# Location of the aqbanking binary to use when converting MT940 files
+# into the kivitendo import format
+aqbanking = /usr/bin/aqbanking-cli
 
 [environment]
 # Add the following paths to the PATH environment variable.
@@ -166,17 +165,22 @@ openofficeorg_daemon = 1
 openofficeorg_daemon_port = 2002
 
 [task_server]
-# 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
 # Chose a system user the daemon should run under when started as root.
 run_as =
 
+[task_server/notify_on_failure]
+# If you want email notifications for failed jobs then set this to a
+# kivitendo user (login) name. The subject can be changed as well.
+send_email_to  =
+# The "From:" header for said email.
+email_from     = kivitendo Daemon <root@localhost>
+# The subject for said email.
+email_subject  = kivitendo Task-Server: Hintergrundjob fehlgeschlagen
+# The template file used for the email's body.
+email_template = templates/webpages/task_server/failure_notification_email.txt
+
 [periodic_invoices]
 # The user name a report about the posted and printed invoices is sent
 # to.
@@ -233,11 +237,17 @@ 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 =
+
+# Several tests need a database they can alter data in freely. This
+# 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
 
 [devel]
 # Several settings related to the development of kivitendo.
@@ -321,3 +331,24 @@ auto_reload_resources = 0
 
 # If set to 1 each exception will include a full stack backtrace.
 backtrace_on_die = 0
+
+[cti]
+# If you want phone numbers to be clickable then this must be set to a
+# command that does the actually dialing. Within this command three
+# variables are replaced before it is executed:
+#
+# 1. <%phone_extension%> and <%phone_password%> are taken from the user
+#    configuration (changeable in the admin interface).
+# 2. <%number%> is the number to dial. It has already been sanitized
+#    and formatted correctly regarding e.g. the international dialing
+#    prefix.
+#
+# The following is an example that works with the OpenUC telephony
+# server:
+# dial_command = curl --insecure -X PUT https://<%phone_extension%>:<%phone_password%>@IP.AD.DR.ESS:8443/sipxconfig/rest/my/call/<%number%>
+dial_command =
+# If you need to dial something before the actual number then set
+# external_prefix to it.
+external_prefix = 0
+# The prefix for international calls (numbers starting with +).
+international_dialing_prefix = 00