1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/collabora_ynh.git synced 2024-09-03 18:16:25 +02:00

Merge branch 'testing' into version-2

This commit is contained in:
ericgaspar 2023-07-30 10:20:00 +01:00
commit 85b58c0402
3 changed files with 8 additions and 8 deletions

View file

@ -29,7 +29,7 @@ Collabora Online is a powerful LibreOffice-based online office that supports all
- presentations (odp, pptx, ppt…)
**Shipped version:** 22.05.12.2~ynh1
**Shipped version:** 22.05.14.3~ynh1
## Screenshots

View file

@ -28,7 +28,7 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO
- des tableurs (ods, xlsx, xls…)
- présentations (odp, pptx, ppt…)
**Version incluse :** 22.05.12.2~ynh1
**Version incluse :** 22.05.14.3~ynh1
## Captures décran

View file

@ -7,21 +7,21 @@ location ~ ^/$ {
# static files
location ^~ /browser {
proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host;
proxy_set_header Host $host;
more_set_headers "X-Frame-Options: ALLOWALL";
}
# WOPI discovery URL
location ^~ /hosting/discovery {
proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host;
proxy_set_header Host $host;
more_set_headers "X-Frame-Options: ALLOWALL";
}
# Capabilities
location ^~ /hosting/capabilities {
proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host;
proxy_set_header Host $host;
more_set_headers "X-Frame-Options: ALLOWALL";
}
@ -30,7 +30,7 @@ location ~ ^/cool/(.*)/ws$ {
proxy_pass http://localhost:__PORT__;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_set_header Host $host;
proxy_read_timeout 36000s;
more_set_headers "X-Frame-Options: ALLOWALL";
}
@ -38,7 +38,7 @@ location ~ ^/cool/(.*)/ws$ {
# download, presentation and image upload
location ~ ^/(c|l)ool {
proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host;
proxy_set_header Host $host;
more_set_headers "X-Frame-Options: ALLOWALL";
}
@ -47,6 +47,6 @@ location ^~ /cool/adminws {
proxy_pass http://localhost:__PORT__;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_set_header Host $host;
proxy_read_timeout 36000s;
}