X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=96a7d429020d122d4cd285716ace9cce7cd26abd;hb=a1a1263bff85923b68be47848cd9441dfdba7fb1;hp=bb66bce4e5f391e009c6be0f808a4df3cc0e7641;hpb=9ac69514fec5d49a989f7489beaed480a42d217d;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index bb66bce4e..96a7d4290 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -6,16 +6,20 @@ admin_password = admin123
 
 # Which module to use for authentication. Valid values are 'DB' and
 # 'LDAP'.  If 'LDAP' is used then users cannot change their password
-# via Lx-Office.
+# via kivitendo.
 module = DB
 
 # The cookie name can be changed if desired.
-cookie_name = lx_office_erp_session_id
+cookie_name = kivitendo_session_id
 
 # The number of minutes a session is valid. The default value is eight
 # hours.
 session_timeout = 480
 
+# The number of seconds to penalize failed login attempts. 0 disables
+# it.
+failed_login_penalty = 5
+
 [authentication/database]
 # Connection information for the database with the user and group
 # inforamtion.  This information is always needed, even if LDAP is
@@ -26,7 +30,7 @@ session_timeout = 480
 # users' passwords.
 host     = localhost
 port     = 5432
-db       = lxerp_auth
+db       = kivitendo_auth
 user     = postgres
 password =
 
@@ -70,17 +74,6 @@ dbcharset = UTF-8
 webdav = 0
 vertreter = 0
 
-# Show fields used for the best before date
-# ATTENTION! If you enabled this feature you can not simply turn it off again
-# without taking care that best_before fields are emptied in the database.
-# This can be done with the following query:
-#
-#  UPDATE inventory SET bestbefore = NULL;
-#
-# Any stock contents containing a best before date will be impossible to stock
-# out otherwise.
-show_best_before = 0
-
 ## Pictures for parts
 # Show the picture in the part form
 parts_show_image = 1
@@ -89,9 +82,6 @@ parts_image_css = border:0;float:left;max-width:250px;margin-top:20px:margin-rig
 # Show the picture in the results when you search for parts
 parts_listing_images = 0
 
-# Should payments be changeable after posting (0 = never; 1 = every time; 2 = on the same day)
-payments_changeable = 1
-
 [paths]
 # path to temporary files (must be writeable by the web server)
 userspath = users
@@ -111,14 +101,16 @@ memberfile = users/members
 method = smtp
 # Location of sendmail for 'method = sendmail'
 sendmail = /usr/sbin/sendmail -t<%if myconfig_email%> -f <%myconfig_email%><%end%>
-# Settings for 'method = smtp'.
+# Settings for 'method = smtp'. Only set 'port' if your SMTP server
+# runs on a non-standard port (25 for 'security=none' or
+# 'security=tls', 465 for 'security=ssl').
 host = localhost
-port = 25
+#port = 25
 # Security can be 'tls', 'ssl' or 'none'. Unset equals 'none'. This
 # determines whether or not encryption is used and which kind. For
-# 'tls' the module 'Net::SMTP::TLS' is required; for 'ssl'
-# 'Net::SMTP::TLS' is required and 'none' only uses 'Net::SMTP'.
-security = tls
+# 'tls' the module 'Net::SSLGlue' is required; for 'ssl'
+# 'Net::SMTP::SSL' is required and 'none' only uses 'Net::SMTP'.
+security = none
 # Authentication is only used if 'login' is set. You should only use
 # that with 'tls' or 'ssl' encryption.
 login =
@@ -167,7 +159,7 @@ openofficeorg_daemon_port = 2002
 [task_server]
 # User name to use for database access
 login =
-# Set to 1 for debug messages in /tmp/lx-office-debug.log
+# Set to 1 for debug messages in /tmp/kivitendo-debug.log
 debug = 1
 # Chose a system user the daemon should run under when started as root.
 run_as =
@@ -177,7 +169,7 @@ run_as =
 # to.
 send_email_to  = mb
 # The "From:" header for said email.
-email_from     = Lx-Office Daemon <root@localhost>
+email_from     = kivitendo Daemon <root@localhost>
 # The subject for said email.
 email_subject  = Benachrichtigung: automatisch erstellte Rechnungen
 # The template file used for the email's body.
@@ -206,27 +198,6 @@ email_subject  = kivitendo self test report
 # template. currently txt and html templates are recognized and correctly mime send.
 email_template = templates/mail/self_test/status_mail.txt
 
-[datev_check]
-# it is possible to make a quick DATEV export everytime you post a record to ensure things
-# work nicely with their data requirements. This will result in a slight overhead though
-# you can enable this for each type of record independantly.
-
-# check when a sales invoice or a payment for a sales invoice is posted
-check_on_sales_invoice = 0
-# check when a purchase invoice or a payment for a purchase invoice is posted
-check_on_purchase_invoice = 0
-# check when an ar transaction is posted
-check_on_ar_transaction = 0
-# check when an ap transaction is posted
-check_on_ap_transaction = 0
-# check when a gl transaction is posted
-check_on_gl_transaction = 0
-
-# not implemented yet:
-#check_on_cash_and_receipt = 0
-#check_on_dunning = 0
-#check_on_sepa_import = 0
-
 [console]
 # autologin to use if none is given
 login =
@@ -242,13 +213,13 @@ login =
 history_file = users/console_history
 
 # location of a separate log file for the console. everything normally written
-# to the lx-office log will be put here if triggered from the console
-log_file = /tmp/lxoffice_console_debug.log
+# to the kivitendo log will be put here if triggered from the console
+log_file = /tmp/kivitendo_console_debug.log
 
 [testing]
 
 # autologin to use if none is given
-login = demo
+login = myxplace_standard
 
 [debug]
 # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE
@@ -312,4 +283,4 @@ keep_temp_files = 0
 restart_fcgi_process_on_changes = 0
 
 # The file name where the debug messages are written to.
-file_name = /tmp/lx-office-debug.log
+file_name = /tmp/kivitendo-debug.log