eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #6814 from nextcloud/enh/noid/collabora-online

Browse source 
collabora: allow to use enterprise container image with support key
This commit is contained in:
Simon L. 2025-11-06 11:24:23 +01:00 • committed by GitHub
commit 849f052a41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
php/src/ContainerDefinitionFetcher.php
View file

@ -67,6 +67,9 @@ readonly class ContainerDefinitionFetcher {
if (!$this->configurationManager->isCollaboraEnabled()) {
continue;
}
if ($this->configurationManager->isCollaboraSubscriptionEnabled()) {
$entry['image'] = 'ghcr.io/nextcloud-releases/aio-collabora-online';
}
} elseif ($entry['container_name'] === 'nextcloud-aio-talk') {
if (!$this->configurationManager->isTalkEnabled()) {
continue;

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

@ -971,6 +971,13 @@ class ConfigurationManager
return $config['collabora_additional_options'];
}
public function isCollaboraSubscriptionEnabled() : bool {
if (str_contains($this->GetAdditionalCollaboraOptions(), '--o:support_key=')) {
return true;
}
return false;
}
public function DeleteAdditionalCollaboraOptions() : void {
$config = $this->GetConfig();
$config['collabora_additional_options'] = '';