eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-04 04:56:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #7123 from nextcloud/enh/noid/fix-caddy-talk-traffic

Browse source 
fix a bug with aio-caddy now proxying all traffic to aio-talk
This commit is contained in:
Simon L. 2025-11-20 10:37:02 +01:00 • committed by GitHub
commit 84dd2b3c4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
php/src/Docker/DockerActionManager.php
View file

@ -225,6 +225,7 @@ readonly class DockerActionManager {
$aioVariables = $container->GetAioVariables()->GetVariables();
foreach ($aioVariables as $variable) {
$config = $this->configurationManager->GetConfig();
$variable = $this->replaceEnvPlaceholders($variable);
$variableArray = explode('=', $variable);
$config[$variableArray[0]] = $variableArray[1];
$this->configurationManager->WriteConfig($config);
@ -283,8 +284,8 @@ readonly class DockerActionManager {
}
} else if ($port === '%TALK_PORT%') {
$port = $this->configurationManager->GetTalkPort();
// Skip publishing talk port if it is set to the same value like the apache port
if ($port === $this->configurationManager->GetApachePort()) {
// Skip publishing talk port if it is set to 443
if ($port === '443') {
continue;
}
}