Merge branch 'multi-http-admins' into next-release

[jirafeau.git] / docker / docker_config.php

diff --git a/docker/docker_config.php b/docker/docker_config.php
index 8c63134df26862039eb32f1c39d65a1024dd8f89..634d58bfdcc5373a2b24f648006bc174a1be732f 100644 (file)
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -161,17 +161,19 @@ 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');


@@ -192,4 +194,4 @@ function run_setup(&$cfg)
     }
 }
 
     }
 }
 

-run_setup($cfg);
+run_setup($cfg);
\ No newline at end of file