[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - etc/apache2 etc/nginx

[Libreoffice Gerrit user]

 etc/apache2/loolwsd.conf |    4 ++++
 etc/nginx/loolwsd.conf   |    6 ++++++
 2 files changed, 10 insertions(+)

New commits:
commit fec9d14a2f86bdcaf781081d70267d68cd6341b1
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 29 21:57:40 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Nov 30 13:47:12 2018 +0100

    add the /hosting/capabilities endpoint to the example reverse proxy configs
    
    Change-Id: Ia4c2e4a54549af89071752c631a9ae5fed678c63
    Reviewed-on: https://gerrit.libreoffice.org/64288
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/etc/apache2/loolwsd.conf b/etc/apache2/loolwsd.conf
index 10b66b47f..7ccfe0051 100644
--- a/etc/apache2/loolwsd.conf
+++ b/etc/apache2/loolwsd.conf
@@ -20,6 +20,10 @@
   ProxyPass           /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0
   ProxyPassReverse    /hosting/discovery http://127.0.0.1:9980/hosting/discovery
 
+  # Capabilities
+  ProxyPass           /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0
+  ProxyPassReverse    /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities
+
   # Main websocket
   ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon
 
diff --git a/etc/nginx/loolwsd.conf b/etc/nginx/loolwsd.conf
index f55f8829b..e176760b9 100644
--- a/etc/nginx/loolwsd.conf
+++ b/etc/nginx/loolwsd.conf
@@ -10,6 +10,12 @@
         proxy_set_header Host $http_host;
     }
 
+    # Capabilities
+    location ^~ /hosting/capabilities {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
     # main websocket
     location ~ ^/lool/(.*)/ws$ {
         proxy_pass http://localhost:9980;