diff --git a/php/containers.json b/php/containers.json index 6f3260260ee..68890258cef 100644 --- a/php/containers.json +++ b/php/containers.json @@ -189,7 +189,7 @@ "internal_port": "9980", "environment": [ "aliasgroup1=https://%NC_DOMAIN%:443", - "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY%", + "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY% --o:remote_font_config.url=https://%NC_DOMAIN%/apps/richdocuments/settings/fonts.json", "dictionaries=%COLLABORA_DICTIONARIES%", "TZ=%TIMEZONE%" ], diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php index cc4478e0c8d..dfe7cc3ebb3 100644 --- a/php/src/Docker/DockerActionManager.php +++ b/php/src/Docker/DockerActionManager.php @@ -236,8 +236,16 @@ public function CreateContainer(Container $container) : void { $envs = $container->GetEnvironmentVariables()->GetVariables(); foreach($envs as $key => $env) { - $patterns = ['/%(.*)%/']; + // TODO: This whole block below is a hack and needs to get reworked in order to support multiple substitutions per line by default for all envs + if (str_starts_with($env, 'extra_params=')) { + $env = str_replace('%COLLABORA_SECCOMP_POLICY%', $this->configurationManager->GetCollaboraSeccompPolicy(), $env); + $env = str_replace('%NC_DOMAIN%', $this->configurationManager->GetDomain(), $env); + $envs[$key] = $env; + continue; + } + // Original implementation + $patterns = ['/%(.*)%/']; if(preg_match($patterns[0], $env, $out) === 1) { $replacements = array();