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

Make 'nextcloudAdditionalApks' an attribute

Browse source 
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
This commit is contained in:
Pablo Zmdl 2026-01-26 10:10:08 +01:00
parent 4ad8fcf258
commit d50dc2db1d
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -677,11 +677,9 @@ class ConfigurationManager
set { $this->set('trusted_cacerts_dir', $value); } set { $this->set('trusted_cacerts_dir', $value); }
} }
public function GetNextcloudAdditionalApks() : string { public string $nextcloudAdditionalApks {
$envVariableName = 'NEXTCLOUD_ADDITIONAL_APKS'; get => trim($this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_ADDITIONAL_APKS', 'nextcloud_additional_apks', 'imagemagick'));
$configName = 'nextcloud_additional_apks'; set { $this->set('nextcloud_addtional_apks', $value); }
$defaultValue = 'imagemagick';
return trim($this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue));
} }
public function GetNextcloudAdditionalPhpExtensions() : string { public function GetNextcloudAdditionalPhpExtensions() : string {
@ -1077,7 +1075,7 @@ class ConfigurationManager
'APACHE_MAX_SIZE' => (string)($this->GetApacheMaxSize()), 'APACHE_MAX_SIZE' => (string)($this->GetApacheMaxSize()),
'COLLABORA_SECCOMP_POLICY' => $this->GetCollaboraSeccompPolicy(), 'COLLABORA_SECCOMP_POLICY' => $this->GetCollaboraSeccompPolicy(),
'NEXTCLOUD_STARTUP_APPS' => $this->GetNextcloudStartupApps(), 'NEXTCLOUD_STARTUP_APPS' => $this->GetNextcloudStartupApps(),
'NEXTCLOUD_ADDITIONAL_APKS' => $this->GetNextcloudAdditionalApks(), 'NEXTCLOUD_ADDITIONAL_APKS' => $this->nextcloudAdditionalApks,
'NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS' => $this->GetNextcloudAdditionalPhpExtensions(), 'NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS' => $this->GetNextcloudAdditionalPhpExtensions(),
'INSTALL_LATEST_MAJOR' => $this->installLatestMajor, 'INSTALL_LATEST_MAJOR' => $this->installLatestMajor,
'REMOVE_DISABLED_APPS' => $this->shouldDisabledAppsGetRemoved() ? 'yes' : '', 'REMOVE_DISABLED_APPS' => $this->shouldDisabledAppsGetRemoved() ? 'yes' : '',