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

fix collabora not working out of the box

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-04-04 17:28:53 +02:00
parent 936b4ebb0f
commit 5185a9f4ae
2 changed files with 8 additions and 3 deletions
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 # Collabora
if [ "$COLLABORA_ENABLED" = 'yes' ]; then 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 if ! [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ app:install richdocuments php /var/www/html/occ app:install richdocuments
elif [ "$(php /var/www/html/occ config:app:get richdocuments enabled)" = "no" ]; then elif [ "$(php /var/www/html/occ config:app:get richdocuments enabled)" = "no" ]; then
@ -285,11 +289,11 @@ if [ "$COLLABORA_ENABLED" = 'yes' ]; then
else else
php /var/www/html/occ app:update richdocuments php /var/www/html/occ app:update richdocuments
fi 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: # 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: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 else
if [ -d "/var/www/html/custom_apps/richdocuments" ]; then if [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ config:system:delete allow_local_remote_servers 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", "CLAMAV_HOST=nextcloud-aio-clamav",
"ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%", "ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
"COLLABORA_ENABLED=%COLLABORA_ENABLED%", "COLLABORA_ENABLED=%COLLABORA_ENABLED%",
"COLLABORA_HOST=nextcloud-aio-collabora",
"TALK_ENABLED=%TALK_ENABLED%", "TALK_ENABLED=%TALK_ENABLED%",
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice" "ONLYOFFICE_HOST=nextcloud-aio-onlyoffice"
], ],