etc/apache2/loolwsd.conf | 4 ++++
etc/nginx/loolwsd.conf | 6 ++++++
2 files changed, 10 insertions(+)
New commits:
commit a41864e8a502ca39c5e07ca430a3f922c09012db
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Nov 29 21:57:40 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Nov 30 13:46:33 2018 +0100
add the /hosting/capabilities endpoint to the example reverse proxy configs
Change-Id: Ia4c2e4a54549af89071752c631a9ae5fed678c63
Reviewed-on: https://gerrit.libreoffice.org/64286
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
