X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=config%2Fkivitendo.conf.default;h=0005aba59d81a8b4754c4c7af6d55feca925bdbd;hb=49be66cdf74882abde5a93832a959e27baddd925;hp=3fb87cdf2d0a9b32ae493c47255346ee86af3252;hpb=7a6602d68e1088a532742ebe2b326c428da54fb0;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 3fb87cdf2..0005aba59 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -65,23 +65,6 @@ 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
-
 [paths]
 # path to temporary files (must be writeable by the web server)
 userspath = users
@@ -226,11 +209,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.