From c5756e30c9170744abcd39aacd2c1121af6d893f Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Sun, 14 Apr 2019 10:31:49 +0200 Subject: [PATCH] Make less matching less strict again (#140) * remove setting insecure cookies by default * less strict matching partially undoes https://github.com/zokradonh/kopano-docker/commit/48e22da9d17ab6ae658be98d0997f226924fcacb --- webapp/start.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/webapp/start.sh b/webapp/start.sh index 0f051c7..68c7f69 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -22,11 +22,10 @@ php_cfg_gen() { fi case $cfg_value in true|TRUE|false|FALSE) - echo boolean value - sed -ri "s#(\s*define).+${cfg_setting}'.+#\tdefine(\x27${cfg_setting}\x27, ${cfg_value}\);#g" "$cfg_file" + sed -ri "s#(\s*define).+${cfg_setting}.+#\tdefine(\x27${cfg_setting}\x27, ${cfg_value}\);#g" "$cfg_file" ;; *) - sed -ri "s#(\s*define).+${cfg_setting}'.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file" + sed -ri "s#(\s*define).+${cfg_setting}.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file" ;; esac else @@ -58,9 +57,6 @@ else php_cfg_gen /etc/kopano/webapp/config.php DEFAULT_SERVER "https://${KCCONF_SERVERHOSTNAME}:${KCCONF_SERVERPORT}/kopano" fi -echo "Configuring Kopano WebApp for use behind a reverse proxy" -php_cfg_gen /etc/kopano/webapp/config.php INSECURE_COOKIES true - # configuring webapp from env for setting in $(compgen -A variable KCCONF_WEBAPP_); do setting2=${setting#KCCONF_WEBAPP_}