eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-14 09:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Make 'trustedCacertsDir' an attribute

Browse source 
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
This commit is contained in:
Pablo Zmdl 2026-01-26 10:09:32 +01:00
parent 63245430ef
commit 4ad8fcf258
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php/src/ContainerDefinitionFetcher.php
View file

@ -134,7 +134,7 @@ readonly class ContainerDefinitionFetcher {
continue; continue;
} }
} elseif ($value['source'] === '%NEXTCLOUD_TRUSTED_CACERTS_DIR%') { } elseif ($value['source'] === '%NEXTCLOUD_TRUSTED_CACERTS_DIR%') {
$value['source'] = $this->configurationManager->GetTrustedCacertsDir(); $value['source'] = $this->configurationManager->trustedCacertsDir;
if($value['source'] === '') { if($value['source'] === '') {
continue; continue;
} }

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

@ -672,11 +672,9 @@ class ConfigurationManager
set { $this->set('docker_socket_path', $value); } set { $this->set('docker_socket_path', $value); }
} }
public function GetTrustedCacertsDir() : string { public string $trustedCacertsDir {
$envVariableName = 'NEXTCLOUD_TRUSTED_CACERTS_DIR'; get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_TRUSTED_CACERTS_DIR', 'trusted_cacerts_dir', '');
$configName = 'trusted_cacerts_dir'; set { $this->set('trusted_cacerts_dir', $value); }
$defaultValue = '';
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
} }
public function GetNextcloudAdditionalApks() : string { public function GetNextcloudAdditionalApks() : string {
@ -1073,7 +1071,7 @@ class ConfigurationManager
'NEXTCLOUD_MAX_TIME' => $this->nextcloudMaxTime, 'NEXTCLOUD_MAX_TIME' => $this->nextcloudMaxTime,
'BORG_RETENTION_POLICY' => $this->borgRetentionPolicy, 'BORG_RETENTION_POLICY' => $this->borgRetentionPolicy,
'FULLTEXTSEARCH_JAVA_OPTIONS' => $this->fulltextsearchJavaOptions, 'FULLTEXTSEARCH_JAVA_OPTIONS' => $this->fulltextsearchJavaOptions,
'NEXTCLOUD_TRUSTED_CACERTS_DIR' => $this->GetTrustedCacertsDir(), 'NEXTCLOUD_TRUSTED_CACERTS_DIR' => $this->trustedCacertsDir,
'ADDITIONAL_DIRECTORIES_BACKUP' => $this->GetAdditionalBackupDirectoriesString() !== '' ? 'yes' : '', 'ADDITIONAL_DIRECTORIES_BACKUP' => $this->GetAdditionalBackupDirectoriesString() !== '' ? 'yes' : '',
'BORGBACKUP_HOST_LOCATION' => $this->borgBackupHostLocation, 'BORGBACKUP_HOST_LOCATION' => $this->borgBackupHostLocation,
'APACHE_MAX_SIZE' => (string)($this->GetApacheMaxSize()), 'APACHE_MAX_SIZE' => (string)($this->GetApacheMaxSize()),