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

Merge pull request #6825 from nextcloud/alan/fix-wopi-serving
Some checks failed
Codespell / Check spelling (push) Has been cancelled
Details
Docker Lint / docker-lint (push) Has been cancelled
Details
Json Validator / Json Validator (push) Has been cancelled
Details
Lint php / php-lint (push) Has been cancelled
Details
PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled
Details
Static analysis / static-psalm-analysis (push) Has been cancelled
Details
Lint php / php-lint-summary (push) Has been cancelled
Details

Browse source 
Use a fixed port for internal WOPI requests and callbacks
This commit is contained in:
Simon L. 2025-09-08 11:42:45 +02:00 • committed by GitHub
commit e4c2f44d81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/apache/Caddyfile
View file

@ -15,7 +15,7 @@
} }
https://{$ADDITIONAL_TRUSTED_DOMAIN}:443, https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
http://{$APACHE_HOST}:{$APACHE_PORT}, # For Collabora callback http://{$APACHE_HOST}:23973, # For Collabora callback and WOPI requests, see containers.json
{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} { {$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
header -Server header -Server
header -X-Powered-By header -X-Powered-By

4
php/containers.json
View file

@ -379,7 +379,7 @@
], ],
"internal_port": "9980", "internal_port": "9980",
"environment": [ "environment": [
"aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache:%APACHE_PORT%", "aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache:23973",
"extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:logging.level_startup=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY% --o:remote_font_config.url=https://%NC_DOMAIN%/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+", "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:logging.level_startup=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY% --o:remote_font_config.url=https://%NC_DOMAIN%/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+",
"dictionaries=%COLLABORA_DICTIONARIES%", "dictionaries=%COLLABORA_DICTIONARIES%",
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
@ -389,7 +389,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 --wopi-url='http://nextcloud-aio-apache:%APACHE_PORT%' --callback-url='http://nextcloud-aio-apache:%APACHE_PORT%'" "php /var/www/html/occ richdocuments:activate-config --wopi-url='http://nextcloud-aio-apache:23973' --callback-url='http://nextcloud-aio-apache:23973'"
], ],
"profiles": [ "profiles": [
"collabora" "collabora"