github/reverse-proxy-confs
1
0
Fork 0
mirror of https://github.com/linuxserver/reverse-proxy-confs.git synced 2025-07-06 13:01:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #109 from drizuid/patch-1

Browse source 
removed redundant resolver line
This commit is contained in:
aptalca 2020-01-05 12:23:47 -05:00 • committed by GitHub
commit a24e8c0f1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
collabora.subdomain.conf.sample
View file

@ -8,29 +8,34 @@ server {
include /config/nginx/ssl.conf; include /config/nginx/ssl.conf;
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
# static files # static files
location ^~ /loleaflet { location ^~ /loleaflet {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_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 {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_collabora:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# Capabilities # Capabilities
location ^~ /hosting/capabilities { location ^~ /hosting/capabilities {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_collabora:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# main websocket # main websocket
location ~ ^/lool/(.*)/ws$ { location ~ ^/lool/(.*)/ws$ {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_collabora:9980;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
@ -40,12 +45,16 @@ server {
# download, presentation and image upload # download, presentation and image upload
location ~ ^/lool { location ~ ^/lool {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_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 {
resolver 127.0.0.11 valid=30s;
set $upstream_collabora collabora;
proxy_pass https://$upstream_collabora:9980; proxy_pass https://$upstream_collabora:9980;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";