nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-01-19 11:57:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #454 from nextcloud/fix/424/fix-collabora

Browse source 
fix collabora not working out of the box
This commit is contained in:
Simon L 2022-04-06 13:53:23 +02:00 committed by GitHub
commit 21086df922
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Containers/nextcloud/entrypoint.sh
View file

@ -278,6 +278,10 @@ php /var/www/html/occ config:app:set notify_push base_endpoint --value="https://
# Collabora
if [ "$COLLABORA_ENABLED" = 'yes' ]; then
while ! nc -z "$COLLABORA_HOST" 9980; do
echo "waiting for Collabora to become available..."
sleep 5
done
if ! [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ app:install richdocuments
elif [ "$(php /var/www/html/occ config:app:get richdocuments enabled)" = "no" ]; then
@ -285,11 +289,11 @@ if [ "$COLLABORA_ENABLED" = 'yes' ]; then
else
php /var/www/html/occ app:update richdocuments
fi
php /var/www/html/occ config:app:set richdocuments wopi_url --value="https://$NC_DOMAIN/"
php /var/www/html/occ config:app:set richdocuments public_wopi_url --value="https://$NC_DOMAIN/"
# php /var/www/html/occ richdocuments:activate-config
# Fix https://github.com/nextcloud/all-in-one/issues/188:
php /var/www/html/occ config:system:set allow_local_remote_servers --type=bool --value=true
php /var/www/html/occ config:app:set richdocuments wopi_url --value="http://$COLLABORA_HOST:9980/"
php /var/www/html/occ config:app:set richdocuments public_wopi_url --value="https://$NC_DOMAIN/"
php /var/www/html/occ richdocuments:activate-config
else
if [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ config:system:delete allow_local_remote_servers

1
php/containers.json
View file

@ -131,6 +131,7 @@
"CLAMAV_HOST=nextcloud-aio-clamav",
"ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
"COLLABORA_ENABLED=%COLLABORA_ENABLED%",
"COLLABORA_HOST=nextcloud-aio-collabora",
"TALK_ENABLED=%TALK_ENABLED%",
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice"
],