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 apache_port => apachePort

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

2
php/public/index.php
View file

@ -92,7 +92,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
return $view->render($response, 'containers.twig', [
'domain' => $configurationManager->domain,
'apache_port' => $configurationManager->apache_port,
'apache_port' => $configurationManager->apachePort,
'borg_backup_host_location' => $configurationManager->borgBackupHostLocation,
'borg_remote_repo' => $configurationManager->borgRemoteRepo,
'borg_public_key' => $configurationManager->GetBorgPublicKey(),

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

@ -381,7 +381,7 @@ class ConfigurationManager
}
// Get the apache port
$port = $this->apache_port;
$port = $this->apachePort;
if (!filter_var($dnsRecordIP, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
if ($port === '443') {
@ -568,7 +568,7 @@ class ConfigurationManager
$this->set('password', $newPassword);
}
public string $apache_port {
public string $apachePort {
get => $this->GetEnvironmentalVariableOrConfig('APACHE_PORT', 'apache_port', '443');
set { $this->set('apache_port', $value); }
}
@ -1057,7 +1057,7 @@ class ConfigurationManager
'AIO_URL' => $this->aioUrl,
'SELECTED_RESTORE_TIME' => $this->selectedRestoreTime,
'RESTORE_EXCLUDE_PREVIEWS' => $this->restoreExcludePreviews ? '1' : '',
'APACHE_PORT' => $this->apache_port,
'APACHE_PORT' => $this->apachePort,
'APACHE_IP_BINDING' => $this->apacheIpBinding,
'TALK_PORT' => $this->talk_port,
'TURN_DOMAIN' => $this->turnDomain,

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

@ -115,7 +115,7 @@ readonly class DockerActionManager {
$containerName = $container->identifier;
$internalPort = $container->internalPorts;
if ($internalPort === '%APACHE_PORT%') {
$internalPort = $this->configurationManager->apache_port;
$internalPort = $this->configurationManager->apachePort;
} elseif ($internalPort === '%TALK_PORT%') {
$internalPort = $this->configurationManager->talk_port;
}
@ -253,7 +253,7 @@ readonly class DockerActionManager {
$port = $value->port;
$protocol = $value->protocol;
if ($port === '%APACHE_PORT%') {
$port = $this->configurationManager->apache_port;
$port = $this->configurationManager->apachePort;
// Do not expose udp if AIO is in reverse proxy mode
if ($port !== '443' && $protocol === 'udp') {
continue;
@ -275,7 +275,7 @@ readonly class DockerActionManager {
$port = $value->port;
$protocol = $value->protocol;
if ($port === '%APACHE_PORT%') {
$port = $this->configurationManager->apache_port;
$port = $this->configurationManager->apachePort;
// Do not expose udp if AIO is in reverse proxy mode
if ($port !== '443' && $protocol === 'udp') {
continue;