Merge branch 'main' into testing

This commit is contained in:
Magnus Andersson 2024-04-17 17:42:40 +02:00
commit 069eb7ce93
Signed by untrusted user: mandersson
GPG key ID: 19CB2C58E1F19B16

View file

@ -24,6 +24,7 @@ $CONFIG = array (
'config_is_read_only' => true, 'config_is_read_only' => true,
'csrf.disabled' => true, 'csrf.disabled' => true,
'datadirectory' => '/var/www/html/data', 'datadirectory' => '/var/www/html/data',
'davstorage.request_timeout' => 86401,
'dbhost' => '<%= @dbhost %>', 'dbhost' => '<%= @dbhost %>',
'dbname' => '<%= @dbname %>', 'dbname' => '<%= @dbname %>',
'dbpassword' => '<%= @mysql_user_password %>', 'dbpassword' => '<%= @mysql_user_password %>',