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

Camelize property talk_port => talkPort

Browse source 
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
This commit is contained in:
Pablo Zmdl 2026-01-23 17:40:23 +01:00
parent 567f072ee0
commit f7c5115c70
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php/public/index.php
View file

@ -119,7 +119,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
'is_daily_backup_running' => $configurationManager->isDailyBackupRunning(),
'timezone' => $configurationManager->timezone,
'skip_domain_validation' => $configurationManager->shouldDomainValidationBeSkipped($skip_domain_validation),
'talk_port' => $configurationManager->talk_port,
'talk_port' => $configurationManager->talkPort,
'collabora_dictionaries' => $configurationManager->collaboraDictionaries,
'collabora_additional_options' => $configurationManager->collaboraAdditionalOptions,
'automatic_updates' => $configurationManager->areAutomaticUpdatesEnabled(),

4
php/src/Data/ConfigurationManager.php
View file

@ -573,7 +573,7 @@ class ConfigurationManager
set { $this->set('apache_port', $value); }
}
public string $talk_port {
public string $talkPort {
get => $this->GetEnvironmentalVariableOrConfig('TALK_PORT', 'talk_port', '3478');
set { $this->set('talk_port', $value); }
}
@ -1059,7 +1059,7 @@ class ConfigurationManager
'RESTORE_EXCLUDE_PREVIEWS' => $this->restoreExcludePreviews ? '1' : '',
'APACHE_PORT' => $this->apachePort,
'APACHE_IP_BINDING' => $this->apacheIpBinding,
'TALK_PORT' => $this->talk_port,
'TALK_PORT' => $this->talkPort,
'TURN_DOMAIN' => $this->turnDomain,
'NEXTCLOUD_MOUNT' => $this->nextcloud_mount,
'BACKUP_RESTORE_PASSWORD' => $this->borgRestorePassword,

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

@ -117,7 +117,7 @@ readonly class DockerActionManager {
if ($internalPort === '%APACHE_PORT%') {
$internalPort = $this->configurationManager->apachePort;
} elseif ($internalPort === '%TALK_PORT%') {
$internalPort = $this->configurationManager->talk_port;
$internalPort = $this->configurationManager->talkPort;
}
if ($internalPort !== "" && $internalPort !== 'host') {
@ -259,7 +259,7 @@ readonly class DockerActionManager {
continue;
}
} else if ($port === '%TALK_PORT%') {
$port = $this->configurationManager->talk_port;
$port = $this->configurationManager->talkPort;
}
$portWithProtocol = $port . '/' . $protocol;
$exposedPorts[$portWithProtocol] = null;
@ -281,7 +281,7 @@ readonly class DockerActionManager {
continue;
}
} else if ($port === '%TALK_PORT%') {
$port = $this->configurationManager->talk_port;
$port = $this->configurationManager->talkPort;
// Skip publishing talk tcp port if it is set to 443
if ($port === '443' && $protocol === 'tcp') {
continue;