flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 16:06:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #453 from fbartels/webapp-double-quotes

Browse Source 
make sed match on the config option with both single and double quotes
This commit is contained in:
Felix Bartels 2020-09-23 14:37:28 +02:00 committed by GitHub
commit 5f07629a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/meet/docker-compose-sfu.yml
View File

@ -3,7 +3,6 @@ version: "3.5"
services: services:
kopano_kwmserver: kopano_kwmserver:
environment: environment:
- DEBUG=true
- enable_mcu_api=yes - enable_mcu_api=yes
- pipeline_forced_regexp=@conference/.* - pipeline_forced_regexp=@conference/.*
#- pipeline_forced_regexp=@group/.* #- pipeline_forced_regexp=@group/.*

4
examples/webapp.yml
View File

@ -44,8 +44,8 @@ services:
- KCCONF_SERVERHOSTNAME= - KCCONF_SERVERHOSTNAME=
# https port of kopano system # https port of kopano system
- KCCONF_SERVERPORT= - KCCONF_SERVERPORT=
- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS} #- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS}
#- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=kopano-webapp-plugin-mdm - ADDITIONAL_KOPANO_WEBAPP_PLUGINS=kopano-webapp-plugin-mdm
- KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_USER_DEFAULT_ENABLE_MDM=true - 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=kopano_zpush:9080
- KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_SERVER_SSL=false - KCCONF_WEBAPPPLUGIN_MDM_PLUGIN_MDM_SERVER_SSL=false

4
php/start-helper.sh
View File

@ -15,10 +15,10 @@ php_cfg_gen() {
case $cfg_value in case $cfg_value in
# TODO stop after the first match (currently matching incl. closing quote) # TODO stop after the first match (currently matching incl. closing quote)
true|TRUE|false|FALSE) true|TRUE|false|FALSE)
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}\x22|${cfg_setting}\x27)\.+#\tdefine(\x22${cfg_setting}\x22, ${cfg_value}\);#g" "$cfg_file"
;; ;;
*) *)
sed -ri "s#(\s*define).+${cfg_setting}\x27.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file" sed -ri "s#(\s*define).+(${cfg_setting}\x22|${cfg_setting}\x27).+#\tdefine(\x22${cfg_setting}\x22, \x22${cfg_value}\x22\);#g" "$cfg_file"
;; ;;
esac esac
else else