mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-02-04 04:56:52 +00:00
Compare commits
5 commits
beff7e6edb
...
f814acafb7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f814acafb7 | ||
|
|
1ad19f65e5 | ||
|
|
ab559dbac6 | ||
|
|
3a892a9c92 | ||
|
|
f1264e1715 |
5 changed files with 18 additions and 18 deletions
|
|
@ -127,11 +127,11 @@ $app->get('/containers', function (Request $request, Response $response, array $
|
||||||
'is_imaginary_enabled' => $configurationManager->isImaginaryEnabled,
|
'is_imaginary_enabled' => $configurationManager->isImaginaryEnabled,
|
||||||
'is_fulltextsearch_enabled' => $configurationManager->isFulltextsearchEnabled,
|
'is_fulltextsearch_enabled' => $configurationManager->isFulltextsearchEnabled,
|
||||||
'additional_backup_directories' => $configurationManager->GetAdditionalBackupDirectoriesString(),
|
'additional_backup_directories' => $configurationManager->GetAdditionalBackupDirectoriesString(),
|
||||||
'nextcloud_datadir' => $configurationManager->nextcloud_datadir_mount,
|
'nextcloud_datadir' => $configurationManager->nextcloudDatadirMount,
|
||||||
'nextcloud_mount' => $configurationManager->nextcloud_mount,
|
'nextcloud_mount' => $configurationManager->nextcloudMount,
|
||||||
'nextcloud_upload_limit' => $configurationManager->nextcloud_upload_limit,
|
'nextcloud_upload_limit' => $configurationManager->nextcloudUploadLimit,
|
||||||
'nextcloud_max_time' => $configurationManager->nextcloudMaxTime,
|
'nextcloud_max_time' => $configurationManager->nextcloudMaxTime,
|
||||||
'nextcloud_memory_limit' => $configurationManager->nextcloud_memory_limit,
|
'nextcloud_memory_limit' => $configurationManager->nextcloudMemoryLimit,
|
||||||
'is_dri_device_enabled' => $configurationManager->isDriDeviceEnabled(),
|
'is_dri_device_enabled' => $configurationManager->isDriDeviceEnabled(),
|
||||||
'is_nvidia_gpu_enabled' => $configurationManager->isNvidiaGpuEnabled(),
|
'is_nvidia_gpu_enabled' => $configurationManager->isNvidiaGpuEnabled(),
|
||||||
'is_talk_recording_enabled' => $configurationManager->isTalkRecordingEnabled,
|
'is_talk_recording_enabled' => $configurationManager->isTalkRecordingEnabled,
|
||||||
|
|
|
||||||
|
|
@ -119,12 +119,12 @@ readonly class ContainerDefinitionFetcher {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($value['source'] === '%NEXTCLOUD_MOUNT%') {
|
if($value['source'] === '%NEXTCLOUD_MOUNT%') {
|
||||||
$value['source'] = $this->configurationManager->nextcloud_mount;
|
$value['source'] = $this->configurationManager->nextcloudMount;
|
||||||
if($value['source'] === '') {
|
if($value['source'] === '') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
} elseif ($value['source'] === '%NEXTCLOUD_DATADIR%') {
|
} elseif ($value['source'] === '%NEXTCLOUD_DATADIR%') {
|
||||||
$value['source'] = $this->configurationManager->nextcloud_datadir_mount;
|
$value['source'] = $this->configurationManager->nextcloudDatadirMount;
|
||||||
if ($value['source'] === '') {
|
if ($value['source'] === '') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -140,7 +140,7 @@ readonly class ContainerDefinitionFetcher {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($value['destination'] === '%NEXTCLOUD_MOUNT%') {
|
if ($value['destination'] === '%NEXTCLOUD_MOUNT%') {
|
||||||
$value['destination'] = $this->configurationManager->nextcloud_mount;
|
$value['destination'] = $this->configurationManager->nextcloudMount;
|
||||||
if($value['destination'] === '') {
|
if($value['destination'] === '') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -484,8 +484,8 @@ class ConfigurationManager
|
||||||
|
|
||||||
// Prevent backup to be contained in Nextcloud Datadir as this will delete the backup archive upon restore
|
// Prevent backup to be contained in Nextcloud Datadir as this will delete the backup archive upon restore
|
||||||
// See https://github.com/nextcloud/all-in-one/issues/6607
|
// See https://github.com/nextcloud/all-in-one/issues/6607
|
||||||
if (str_starts_with($location . '/', rtrim($this->nextcloud_datadir_mount, '/') . '/')) {
|
if (str_starts_with($location . '/', rtrim($this->nextcloudDatadirMount, '/') . '/')) {
|
||||||
throw new InvalidSettingConfigurationException("The path must not be a children of or equal to NEXTCLOUD_DATADIR, which is currently set to " . $this->nextcloud_datadir_mount);
|
throw new InvalidSettingConfigurationException("The path must not be a children of or equal to NEXTCLOUD_DATADIR, which is currently set to " . $this->nextcloudDatadirMount);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -623,29 +623,29 @@ class ConfigurationManager
|
||||||
return trim((string)file_get_contents(DataConst::GetBackupPublicKey()));
|
return trim((string)file_get_contents(DataConst::GetBackupPublicKey()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public string $nextcloud_mount {
|
public string $nextcloudMount {
|
||||||
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_MOUNT', 'nextcloud_mount', '');
|
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_MOUNT', 'nextcloud_mount', '');
|
||||||
set { $this->set('nextcloud_mount', $value); }
|
set { $this->set('nextcloud_mount', $value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public string $nextcloud_datadir_mount {
|
public string $nextcloudDatadirMount {
|
||||||
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_DATADIR', 'nextcloud_datadir', 'nextcloud_aio_nextcloud_data');
|
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_DATADIR', 'nextcloud_datadir', 'nextcloud_aio_nextcloud_data');
|
||||||
set { $this->set('nextcloud_datadir_mount', $value); }
|
set { $this->set('nextcloud_datadir_mount', $value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string $nextcloud_upload_limit {
|
public string $nextcloudUploadLimit {
|
||||||
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_UPLOAD_LIMIT', 'nextcloud_upload_limit', '16G');
|
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_UPLOAD_LIMIT', 'nextcloud_upload_limit', '16G');
|
||||||
set { $this->set('nextcloud_upload_limit', $value); }
|
set { $this->set('nextcloud_upload_limit', $value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string $nextcloud_memory_limit {
|
public string $nextcloudMemoryLimit {
|
||||||
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_MEMORY_LIMIT', 'nextcloud_memory_limit', '512M');
|
get => $this->GetEnvironmentalVariableOrConfig('NEXTCLOUD_MEMORY_LIMIT', 'nextcloud_memory_limit', '512M');
|
||||||
set { $this->set('nextcloud_memory_limit', $value); }
|
set { $this->set('nextcloud_memory_limit', $value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public function GetApacheMaxSize() : int {
|
public function GetApacheMaxSize() : int {
|
||||||
$uploadLimit = (int)rtrim($this->nextcloud_upload_limit, 'G');
|
$uploadLimit = (int)rtrim($this->nextcloudUploadLimit, 'G');
|
||||||
return $uploadLimit * 1024 * 1024 * 1024;
|
return $uploadLimit * 1024 * 1024 * 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1058,7 +1058,7 @@ class ConfigurationManager
|
||||||
'APACHE_IP_BINDING' => $this->apacheIpBinding,
|
'APACHE_IP_BINDING' => $this->apacheIpBinding,
|
||||||
'TALK_PORT' => $this->talkPort,
|
'TALK_PORT' => $this->talkPort,
|
||||||
'TURN_DOMAIN' => $this->turnDomain,
|
'TURN_DOMAIN' => $this->turnDomain,
|
||||||
'NEXTCLOUD_MOUNT' => $this->nextcloud_mount,
|
'NEXTCLOUD_MOUNT' => $this->nextcloudMount,
|
||||||
'BACKUP_RESTORE_PASSWORD' => $this->borgRestorePassword,
|
'BACKUP_RESTORE_PASSWORD' => $this->borgRestorePassword,
|
||||||
'CLAMAV_ENABLED' => $this->isClamavEnabled ? 'yes' : '',
|
'CLAMAV_ENABLED' => $this->isClamavEnabled ? 'yes' : '',
|
||||||
'TALK_RECORDING_ENABLED' => $this->isTalkRecordingEnabled ? 'yes' : '',
|
'TALK_RECORDING_ENABLED' => $this->isTalkRecordingEnabled ? 'yes' : '',
|
||||||
|
|
@ -1071,8 +1071,8 @@ class ConfigurationManager
|
||||||
'IMAGINARY_ENABLED' => $this->isImaginaryEnabled ? 'yes' : '',
|
'IMAGINARY_ENABLED' => $this->isImaginaryEnabled ? 'yes' : '',
|
||||||
'FULLTEXTSEARCH_ENABLED' => $this->isFulltextsearchEnabled ? 'yes' : '',
|
'FULLTEXTSEARCH_ENABLED' => $this->isFulltextsearchEnabled ? 'yes' : '',
|
||||||
'DOCKER_SOCKET_PROXY_ENABLED' => $this->isDockerSocketProxyEnabled ? 'yes' : '',
|
'DOCKER_SOCKET_PROXY_ENABLED' => $this->isDockerSocketProxyEnabled ? 'yes' : '',
|
||||||
'NEXTCLOUD_UPLOAD_LIMIT' => $this->nextcloud_upload_limit,
|
'NEXTCLOUD_UPLOAD_LIMIT' => $this->nextcloudUploadLimit,
|
||||||
'NEXTCLOUD_MEMORY_LIMIT' => $this->nextcloud_memory_limit,
|
'NEXTCLOUD_MEMORY_LIMIT' => $this->nextcloudMemoryLimit,
|
||||||
'NEXTCLOUD_MAX_TIME' => $this->nextcloudMaxTime,
|
'NEXTCLOUD_MAX_TIME' => $this->nextcloudMaxTime,
|
||||||
'BORG_RETENTION_POLICY' => $this->GetBorgRetentionPolicy(),
|
'BORG_RETENTION_POLICY' => $this->GetBorgRetentionPolicy(),
|
||||||
'FULLTEXTSEARCH_JAVA_OPTIONS' => $this->GetFulltextsearchJavaOptions(),
|
'FULLTEXTSEARCH_JAVA_OPTIONS' => $this->GetFulltextsearchJavaOptions(),
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ readonly class DockerActionManager {
|
||||||
foreach ($container->volumes->GetVolumes() as $volume) {
|
foreach ($container->volumes->GetVolumes() as $volume) {
|
||||||
// // NEXTCLOUD_MOUNT gets added via bind-mount later on
|
// // NEXTCLOUD_MOUNT gets added via bind-mount later on
|
||||||
// if ($container->identifier === 'nextcloud-aio-nextcloud') {
|
// if ($container->identifier === 'nextcloud-aio-nextcloud') {
|
||||||
// if ($volume->name === $this->configurationManager->nextcloud_mount) {
|
// if ($volume->name === $this->configurationManager->nextcloudMount) {
|
||||||
// continue;
|
// continue;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue