From 94cdd04a566e910b629ff644c28d4690a8620be9 Mon Sep 17 00:00:00 2001 From: drizuid <40674481+drizuid@users.noreply.github.com> Date: Wed, 1 Jan 2020 12:34:37 -0500 Subject: [PATCH 1/2] removed redundant resolver line removed redundant resolver 127.0.0.11 valid=30s; from server block. It's already in ssl.conf which is included via line 9 --- collabora.subdomain.conf.sample | 1 - 1 file changed, 1 deletion(-) diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample index 706e2c0..ac421c0 100644 --- a/collabora.subdomain.conf.sample +++ b/collabora.subdomain.conf.sample @@ -8,7 +8,6 @@ server { include /config/nginx/ssl.conf; - resolver 127.0.0.11 valid=30s; set $upstream_collabora collabora; # static files From 8ce1523d9c79f6a308725e5586b65edd26c21830 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 5 Jan 2020 12:22:18 -0500 Subject: [PATCH 2/2] add resolver into location blocks to prevent duplicate error --- collabora.subdomain.conf.sample | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample index ac421c0..3b260b7 100644 --- a/collabora.subdomain.conf.sample +++ b/collabora.subdomain.conf.sample @@ -8,28 +8,34 @@ server { include /config/nginx/ssl.conf; - set $upstream_collabora collabora; - # static files location ^~ /loleaflet { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Host $http_host; } # WOPI discovery URL location ^~ /hosting/discovery { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Host $http_host; } # Capabilities location ^~ /hosting/capabilities { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Host $http_host; } # main websocket location ~ ^/lool/(.*)/ws$ { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; @@ -39,12 +45,16 @@ server { # download, presentation and image upload location ~ ^/lool { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Host $http_host; } # Admin Console websocket location ^~ /lool/adminws { + resolver 127.0.0.11 valid=30s; + set $upstream_collabora collabora; proxy_pass https://$upstream_collabora:9980; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade";