From 5185a9f4aedc0290432fffa977da0bc32d3bd04e Mon Sep 17 00:00:00 2001 From: szaimen Date: Mon, 4 Apr 2022 17:28:53 +0200 Subject: [PATCH] fix collabora not working out of the box Signed-off-by: szaimen --- Containers/nextcloud/entrypoint.sh | 10 +++++++--- php/containers.json | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index e3aa667e..2f4a6443 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -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 diff --git a/php/containers.json b/php/containers.json index 25ee579e..b1a2279d 100644 --- a/php/containers.json +++ b/php/containers.json @@ -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" ],