diff --git a/examples/meet/docker-compose-sfu.yml b/examples/meet/docker-compose-sfu.yml index 34a7e28..0f5ba9a 100644 --- a/examples/meet/docker-compose-sfu.yml +++ b/examples/meet/docker-compose-sfu.yml @@ -3,7 +3,6 @@ version: "3.5" services: kopano_kwmserver: environment: - - DEBUG=true - enable_mcu_api=yes - pipeline_forced_regexp=@conference/.* #- pipeline_forced_regexp=@group/.* diff --git a/examples/webapp.yml b/examples/webapp.yml index bbcf06e..3127206 100644 --- a/examples/webapp.yml +++ b/examples/webapp.yml @@ -44,8 +44,8 @@ services: - KCCONF_SERVERHOSTNAME= # https port of kopano system - KCCONF_SERVERPORT= - - ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS} - #- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=kopano-webapp-plugin-mdm + #- ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS} + - 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 diff --git a/php/start-helper.sh b/php/start-helper.sh index 93ea89b..8cd2bed 100755 --- a/php/start-helper.sh +++ b/php/start-helper.sh @@ -15,10 +15,10 @@ php_cfg_gen() { case $cfg_value in # TODO stop after the first match (currently matching incl. closing quote) 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 else