extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 12:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

support for Collabora/CODE 21.11+ for the developer install

Browse Source
This commit is contained in:
Ralf Becker 2022-02-02 20:51:49 +02:00
parent 9a52fed3d5
commit 67ac05a786
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/docker/development/docker-compose.yml
View File

@ -201,6 +201,10 @@ services:
# needs to be initialised via: docker run --rm -v dev_collabora-config:/mnt --entrypoint '/bin/cp -r /etc/loolwsd /mnt' quay.io/egroupware/collabora-key:stable # needs to be initialised via: docker run --rm -v dev_collabora-config:/mnt --entrypoint '/bin/cp -r /etc/loolwsd /mnt' quay.io/egroupware/collabora-key:stable
volumes: volumes:
- collabora-config:/etc/loolwsd - collabora-config:/etc/loolwsd
# support for Collabora/CODE 21.11+
- collabora-config:/etc/coolwsd
- $PWD/data/default/loolwsd/loolwsd.xml:/etc/coolwsd/coolwsd.xml
- $PWD/data/default/loolwsd/loolkitconfig.xcu:/etc/coolwsd/loolkitconfig.xcu
# dont try to regenerate the (not used certificate) as volumn is readonly # dont try to regenerate the (not used certificate) as volumn is readonly
environment: environment:
- DONT_GEN_SSL_CERT=1 - DONT_GEN_SSL_CERT=1

12
doc/docker/development/nginx.conf
View File

@ -121,6 +121,11 @@ server {
proxy_pass http://collabora-key:9980; proxy_pass http://collabora-key:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# Collabora/CODE 21.11+
location ^~ /browser {
proxy_pass http://collabora-key:9980;
proxy_set_header Host $http_host;
}
# WOPI discovery URL # WOPI discovery URL
location ^~ /hosting/discovery { location ^~ /hosting/discovery {
@ -135,6 +140,13 @@ server {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# Collabora/CODE 21.11+
location ^~ /cool {
proxy_pass http://collabora-key:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
}
# proxy into rocketchat container # proxy into rocketchat container
location /rocketchat { location /rocketchat {