flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-30 18:07:46 +00:00
Code Issues Releases Wiki Activity

Make less matching less strict again (#140)

Browse Source 
* remove setting insecure cookies by default
* less strict matching partially undoes 48e22da9d1
This commit is contained in:
Felix Bartels 2019-04-14 10:31:49 +02:00 committed by GitHub
parent b75403f69a
commit c5756e30c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/start.sh
View File

@ -22,11 +22,10 @@ php_cfg_gen() {
fi fi
case $cfg_value in case $cfg_value in
true|TRUE|false|FALSE) 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 esac
else else
@ -58,9 +57,6 @@ else
php_cfg_gen /etc/kopano/webapp/config.php DEFAULT_SERVER "https://${KCCONF_SERVERHOSTNAME}:${KCCONF_SERVERPORT}/kopano" php_cfg_gen /etc/kopano/webapp/config.php DEFAULT_SERVER "https://${KCCONF_SERVERHOSTNAME}:${KCCONF_SERVERPORT}/kopano"
fi 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 # configuring webapp from env
for setting in $(compgen -A variable KCCONF_WEBAPP_); do for setting in $(compgen -A variable KCCONF_WEBAPP_); do
setting2=${setting#KCCONF_WEBAPP_} setting2=${setting#KCCONF_WEBAPP_}