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

Merge pull request #13 from YunoHost-Apps/fix-config

Browse source 
Fix nginx config
This commit is contained in:
Rafi59 2019-04-16 09:16:48 +02:00 committed by GitHub
commit 442c5a2a8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/nginx.conf
View file

@ -2,18 +2,21 @@
location ^~ /loleaflet { location ^~ /loleaflet {
proxy_pass http://localhost:__PORT__; proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
more_set_headers "X-Frame-Options: ALLOWALL";
} }
# WOPI discovery URL # WOPI discovery URL
location ^~ /hosting/discovery { location ^~ /hosting/discovery {
proxy_pass http://localhost:__PORT__; proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
more_set_headers "X-Frame-Options: ALLOWALL";
} }
# Capabilities # Capabilities
location ^~ /hosting/capabilities { location ^~ /hosting/capabilities {
proxy_pass http://localhost:__PORT__; proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
more_set_headers "X-Frame-Options: ALLOWALL";
} }
# main websocket # main websocket
@ -23,12 +26,14 @@ location ~ ^/lool/(.*)/ws$ {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_read_timeout 36000s; proxy_read_timeout 36000s;
more_set_headers "X-Frame-Options: ALLOWALL";
} }
# download, presentation and image upload # download, presentation and image upload
location ~ ^/lool { location ~ ^/lool {
proxy_pass http://localhost:__PORT__; proxy_pass http://localhost:__PORT__;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
more_set_headers "X-Frame-Options: ALLOWALL";
} }
# Admin Console websocket # Admin Console websocket

5
manifest.json
View file

@ -37,13 +37,12 @@
{ {
"name": "password", "name": "password",
"type": "string", "type": "password",
"ask": { "ask": {
"en": "Choose a password for Collabora admin", "en": "Choose a password for Collabora admin",
"fr": "Choisissez un mot de passe pour l'administration de Collabora" "fr": "Choisissez un mot de passe pour l'administration de Collabora"
}, },
"example": "password", "example": "password"
"default": ""
}, },
{ {