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

Camelize property nextcloud_mount => nextcloudMount

Browse source 
Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
This commit is contained in:
Pablo Zmdl 2026-01-23 17:41:26 +01:00
parent c732d736d2
commit e89b89cd31
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php/public/index.php
View file

@ -128,7 +128,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
'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->nextcloud_datadir_mount,
'nextcloud_mount' => $configurationManager->nextcloud_mount, 'nextcloud_mount' => $configurationManager->nextcloudMount,
'nextcloud_upload_limit' => $configurationManager->nextcloud_upload_limit, 'nextcloud_upload_limit' => $configurationManager->nextcloud_upload_limit,
'nextcloud_max_time' => $configurationManager->nextcloudMaxTime, 'nextcloud_max_time' => $configurationManager->nextcloudMaxTime,
'nextcloud_memory_limit' => $configurationManager->nextcloud_memory_limit, 'nextcloud_memory_limit' => $configurationManager->nextcloud_memory_limit,

4
php/src/ContainerDefinitionFetcher.php
View file

@ -119,7 +119,7 @@ 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;
} }
@ -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;
} }

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

@ -623,7 +623,7 @@ 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); }
} }
@ -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' : '',

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

@ -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;
// } // }
// } // }
@ -398,9 +398,19 @@ readonly class DockerActionManager {
// This is needed due to a bug in libwebsockets used in Janus which cannot handle unlimited ulimits // This is needed due to a bug in libwebsockets used in Janus which cannot handle unlimited ulimits
$requestBody['HostConfig']['Ulimits'] = [["Name" => "nofile", "Hard" => 200000, "Soft" => 200000]]; $requestBody['HostConfig']['Ulimits'] = [["Name" => "nofile", "Hard" => 200000, "Soft" => 200000]];
// // Special things for the nextcloud container which should not be exposed in the containers.json // // Special things for the nextcloud container which should not be exposed in the containers.json
<<<<<<< HEAD
// } elseif ($container->identifier === 'nextcloud-aio-nextcloud') { // } elseif ($container->identifier === 'nextcloud-aio-nextcloud') {
// foreach ($container->volumes->GetVolumes() as $volume) { // foreach ($container->volumes->GetVolumes() as $volume) {
// if ($volume->name !== $this->configurationManager->nextcloud_mount) { // if ($volume->name !== $this->configurationManager->nextcloud_mount) {
||||||| parent of e6528742 (Camelize property nextcloud_mount => nextcloudMount)
// } elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
// foreach ($container->GetVolumes()->GetVolumes() as $volume) {
// if ($volume->name !== $this->configurationManager->nextcloud_mount) {
=======
// } elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
// foreach ($container->GetVolumes()->GetVolumes() as $volume) {
// if ($volume->name !== $this->configurationManager->nextcloudMount) {
>>>>>>> e6528742 (Camelize property nextcloud_mount => nextcloudMount)
// continue; // continue;
// } // }
// $mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]]; // $mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]];