Merge branch 'new-screenshots' into 'next-release'

[jirafeau_project.git] / docker / docker_config.php

diff --git a/docker/docker_config.php b/docker/docker_config.php
index 6a03b7360aebd63308c0ac8ea49cde3f85e612f1..0becc2da3c601b4e13304d80610b6d2bf9b13cab 100644 (file)
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -161,20 +161,27 @@ function run_setup(&$cfg)
     setup_webroot($cfg);
     env_2_cfg_string($cfg, 'file_hash');
     env_2_cfg_bool($cfg, 'preview');
     setup_webroot($cfg);
     env_2_cfg_string($cfg, 'file_hash');
     env_2_cfg_bool($cfg, 'preview');

-    env_2_cfg_bool($cfg, 'title');
+    env_2_cfg_string($cfg, 'title', false);

     env_2_cfg_string($cfg, 'organisation');
     env_2_cfg_string($cfg, 'contactperson');
     env_2_cfg_string($cfg, 'style');
     env_2_cfg_string($cfg, 'availability_default');
     env_2_cfg_string($cfg, 'organisation');
     env_2_cfg_string($cfg, 'contactperson');
     env_2_cfg_string($cfg, 'style');
     env_2_cfg_string($cfg, 'availability_default');

+    env_2_cfg_string($cfg, 'dark_style');

     env_2_cfg_bool($cfg, 'one_time_download');
     env_2_cfg_bool($cfg, 'enable_crypt');
     env_2_cfg_bool($cfg, 'debug');
     env_2_cfg_int($cfg, 'maximal_upload_size');
     env_2_cfg_string_array($cfg, 'upload_password');
     env_2_cfg_string_array($cfg, 'upload_ip');
     env_2_cfg_bool($cfg, 'one_time_download');
     env_2_cfg_bool($cfg, 'enable_crypt');
     env_2_cfg_bool($cfg, 'debug');
     env_2_cfg_int($cfg, 'maximal_upload_size');
     env_2_cfg_string_array($cfg, 'upload_password');
     env_2_cfg_string_array($cfg, 'upload_ip');

+    env_2_cfg_string_array($cfg, 'admin_ip');

     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
     env_2_cfg_bool($cfg, 'store_uploader_ip');
     env_2_cfg_string_array($cfg, 'upload_ip_nopassword');
     env_2_cfg_string_array($cfg, 'proxy_ip');
     env_2_cfg_bool($cfg, 'store_uploader_ip');

+    env_2_cfg_string($cfg, 'download_password_requirement');
+    env_2_cfg_int($cfg, 'download_password_gen_len');
+    env_2_cfg_string($cfg, 'download_password_gen_chars');
+    env_2_cfg_string($cfg, 'download_password_policy');
+    env_2_cfg_string($cfg, 'download_password_policy_regex');

 
     if ($setup_ok) {
         $cfg['installation_done'] = true;
 
     if ($setup_ok) {
         $cfg['installation_done'] = true;