From 9f15dcb0752566fab4208708ff9e35f1171fd220 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Fri, 25 Sep 2020 10:12:30 -0500
Subject: [PATCH] Update collabora.subdomain.conf.sample

---
 collabora.subdomain.conf.sample | 87 +++++++++------------------------
 1 file changed, 22 insertions(+), 65 deletions(-)

diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index caebc04..91158e7 100644
--- a/collabora.subdomain.conf.sample
+++ b/collabora.subdomain.conf.sample
@@ -8,75 +8,32 @@ server {
 
     include /config/nginx/ssl.conf;
 
-    # static files
-    location ^~ /loleaflet {
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /ldaplogin;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
+        include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
         set $upstream_port 9980;
-        set $upstream_proto https;
+        set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Host $http_host;
-    }
-
-    # WOPI discovery URL
-    location ^~ /hosting/discovery {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app collabora;
-        set $upstream_port 9980;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        proxy_set_header Host $http_host;
-    }
-
-    # Capabilities
-    location ^~ /hosting/capabilities {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app collabora;
-        set $upstream_port 9980;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        proxy_set_header Host $http_host;
-    }
-
-    # main websocket
-    location ~ ^/lool/(.*)/ws$ {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app collabora;
-        set $upstream_port 9980;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        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 {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app collabora;
-        set $upstream_port 9980;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        proxy_set_header Host $http_host;
-    }
-
-    # Admin Console websocket
-    location ^~ /lool/adminws {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app collabora;
-        set $upstream_port 9980;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $http_host;
-        proxy_read_timeout 36000s;
     }
 }