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

[fix] Be able to integrate and use it in NextCloud

Browse source
This commit is contained in:
ljf 2019-01-31 00:19:51 +01:00
parent dde8f6bb34
commit 5dc8e3f15d
4 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/loolwsd.xml
View file

@ -62,7 +62,7 @@
<ssl desc="SSL settings"> <ssl desc="SSL settings">
<enable type="bool" default="true">false</enable> <enable type="bool" default="true">false</enable>
<termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination> <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">true</termination>
<cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path> <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path> <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path> <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>

36
conf/nginx.conf
View file

@ -1,19 +1,41 @@
# static files # static files
location ^~ /loleaflet { location ^~ /loleaflet {
proxy_pass https://localhost:__PORT__; proxy_pass https://localhost:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# WOPI discovery URL # WOPI discovery URL
location ^~ /hosting/discovery { location ^~ /hosting/discovery {
proxy_pass https://localhost:__PORT__; proxy_pass https://localhost:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# websockets, download, presentation and image upload # Capabilities
location ^~ /lool { location ^~ /hosting/capabilities {
proxy_pass https://localhost:__PORT__; proxy_pass https://localhost:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# main websocket
location ~ ^/lool/(.*)/ws$ {
proxy_pass https://localhost:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_read_timeout 36000s;
}
# download, presentation and image upload
location ~ ^/lool {
proxy_pass https://localhost:9980;
proxy_set_header Host $http_host;
}
# Admin Console websocket
location ^~ /lool/adminws {
proxy_pass https://localhost:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host;
proxy_read_timeout 36000s;
}

4
manifest.json
View file

@ -6,8 +6,8 @@
"en": "Collabora online package for YunoHost.", "en": "Collabora online package for YunoHost.",
"fr": "Collabora online pour YunoHost." "fr": "Collabora online pour YunoHost."
}, },
"url": "https://", "url": "https://www.libreoffice.org/download/libreoffice-online/",
"license": "free", "license": "MPL-2.0",
"maintainer": { "maintainer": {
"name": "rafi59", "name": "rafi59",
"email": "rafi59_dev@srvmaison.fr.nf", "email": "rafi59_dev@srvmaison.fr.nf",

3
scripts/remove
View file

@ -26,6 +26,9 @@ final_path=$(ynh_app_setting_get $app final_path)
# REMOVE DEPENDENCIES # REMOVE DEPENDENCIES
#================================================= #=================================================
# Fix "rm: cannot remove '/etc/apt/apt.conf.d/25loolwsd': No such file or directory"
# on apt remove
touch /etc/apt/apt.conf.d/25loolwsd
# Remove metapackage and its dependencies # Remove metapackage and its dependencies
ynh_remove_app_dependencies ynh_remove_app_dependencies