Merge branch 'test' of ../kivitendo-erp_20220811

[mfinanz.git] / config / kivitendo.conf.default

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index de9366ed49750f02c027bf53afc89ca4da12b390..5c2e613544265ecaf9fde590203c64048e5d0b93 100644 (file)
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -38,8 +38,8 @@ failed_login_penalty = 5
 host     = localhost
 port     = 5432
 db       = kivitendo_auth
 host     = localhost
 port     = 5432
 db       = kivitendo_auth

-user     = postgres
-password =
+user     = kivitendo
+password = kivitendo

 
 [authentication/ldap]
 # This section is only relevant if 'module' is set to 'LDAP'. It names
 
 [authentication/ldap]
 # This section is only relevant if 'module' is set to 'LDAP'. It names


@@ -374,6 +374,11 @@ keep_installation_unlocked = 0
 # the web browser to always reload the resources.
 auto_reload_resources = 0
 
 # the web browser to always reload the resources.
 auto_reload_resources = 0
 

+# Alternative to auto_reload_resources. If the installation dir is under git
+# version control, this will use the HEAD commit sha1 as the random GET
+# parameter, so that resources are reloaded if the installed version charnges.
+git_commit_reload_recources = 0
+

 # If set to 1 each exception will include a full stack backtrace.
 backtrace_on_die = 0
 
 # If set to 1 each exception will include a full stack backtrace.
 backtrace_on_die = 0