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 #3232 from nextcloud/enh/3224/fix-OO

Browse source 
Fix OO
This commit is contained in:
Simon L 2023-08-24 11:43:17 +02:00 • committed by GitHub
commit 7e5fe5ac8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Containers/nextcloud/run-exec-commands.sh
View file

@ -15,9 +15,14 @@ if [ -n "$NEXTCLOUD_EXEC_COMMANDS" ]; then
else else
# Collabora must work also if using manual-install # Collabora must work also if using manual-install
if [ "$COLLABORA_ENABLED" = yes ]; then if [ "$COLLABORA_ENABLED" = yes ]; then
echo "Activating collabora config..." echo "Activating Collabora config..."
php /var/www/html/occ richdocuments:activate-config php /var/www/html/occ richdocuments:activate-config
fi fi
# OnlyOffice must work also if using manual-install
if [ "$ONLYOFFICE_ENABLED" = yes ]; then
echo "Activating OnlyOffice config..."
php /var/www/html/occ onlyoffice:documentserver --check
fi
fi fi
sleep inf sleep inf

6
php/containers.json
View file

@ -305,7 +305,7 @@
], ],
"restart": "unless-stopped", "restart": "unless-stopped",
"nextcloud_exec_commands": [ "nextcloud_exec_commands": [
"echo 'Activating collabora config...'", "echo 'Activating Collabora config...'",
"php /var/www/html/occ richdocuments:activate-config" "php /var/www/html/occ richdocuments:activate-config"
], ],
"profiles": [ "profiles": [
@ -563,6 +563,10 @@
"ONLYOFFICE_SECRET" "ONLYOFFICE_SECRET"
], ],
"restart": "unless-stopped", "restart": "unless-stopped",
"nextcloud_exec_commands": [
"echo 'Activating OnlyOffice config...'",
"php /var/www/html/occ onlyoffice:documentserver --check"
],
"profiles": [ "profiles": [
"onlyoffice" "onlyoffice"
], ],