William/Personal-Rancher-Catalog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor adjustments

Browse Source
This commit is contained in:
WilliamMiceli
2019-01-07 11:29:52 -05:00
parent a0cfcfae17
commit 5d898a7fb3
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/Nextcloud/0/Resources/nginx.conf
View File

@@ -21,10 +21,6 @@ http {
server nextcloud:9000; server nextcloud:9000;
} }
upstream collabora {
server collabora:9980;
}
server { server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
@@ -90,7 +86,7 @@ http {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
# Mitigate https://httpoxy.org/ vulnerabilities: # Mitigate https://httpoxy.org/ vulnerabilities:
fastcgi_param HTTP_PROXY ""; fastcgi_param HTTP_PROXY "";
#fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -137,19 +133,19 @@ http {
# static files # static files
location ^~ /loleaflet { location ^~ /loleaflet {
proxy_pass http://collabora; proxy_pass http://collabora: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 http://collabora; proxy_pass http://collabora:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# main websocket # main websocket
location ~ ^/lool/(.*)/ws$ { location ~ ^/lool/(.*)/ws$ {
proxy_pass http://collabora; proxy_pass http://collabora:9980;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
@@ -158,13 +154,13 @@ http {
# download, presentation and image upload # download, presentation and image upload
location ~ ^/lool { location ~ ^/lool {
proxy_pass http://collabora; proxy_pass http://collabora:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# Admin Console websocket # Admin Console websocket
location ^~ /lool/adminws { location ^~ /lool/adminws {
proxy_pass http://collabora; proxy_pass http://collabora:9980;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;