flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-11 16:32:59 +00:00
Code Issues Releases Wiki Activity

match incl closing tags to prevent confusing PLUGIN_MDM_SERVER_SSL with PLUGIN_MDM_SERVER (#449)

Browse Source 
Fixes https://github.com/zokradonh/kopano-docker/issues/446

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels
2020-09-22 08:58:03 +02:00
committed by GitHub
parent 0dd0f49866
commit 2bc513f4fc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/webapp.yml
+1
View File
@@ -48,6 +48,7 @@ services:
#- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=kopano-webapp-plugin-mdm
- KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_USER_DEFAULT_ENABLE_MDM=true
- KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_SERVER=kopano_zpush:9080
- KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_SERVER_SSL=false
networks:
- web-net
php/start-helper.sh
+3 -3
View File
@@ -13,12 +13,12 @@ php_cfg_gen() {
return
fi
case $cfg_value in
# TODO stop after the first match
# TODO stop after the first match (currently matching incl. closing quote)
true|TRUE|false|FALSE)
sed -ri "s#(\s*define).+${cfg_setting}.+#\tdefine(\x27${cfg_setting}\x27, ${cfg_value}\);#g" "$cfg_file"
sed -ri "s#(\s*define).+${cfg_setting}\x27.+#\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}\x27.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file"
;;
esac
else