diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-10-26 16:39:09 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-10-27 14:47:45 +0200 |
| commit | b2272c5924c12d1914bb445945126fafd5b4512f (patch) | |
| tree | df4c68ffa4f11aba97da48eeb421d637ec7d4716 /etc | |
| parent | service_root is advanced setting, forget it for now in sample configs (diff) | |
| download | online-b2272c5924c12d1914bb445945126fafd5b4512f.tar.gz online-b2272c5924c12d1914bb445945126fafd5b4512f.zip | |
drop ssl configs, we want the simplest case, which is nossl
Change-Id: I788690cb3361b50a6db33f1c87b236b59b94821b
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/apache2/loolwsd-ssl.conf | 37 | ||||
| -rw-r--r-- | etc/apache2/loolwsd.conf (renamed from etc/apache2/loolwsd-nossl.conf) | 0 | ||||
| -rw-r--r-- | etc/nginx/loolwsd-ssl.conf | 36 | ||||
| -rw-r--r-- | etc/nginx/loolwsd.conf (renamed from etc/nginx/loolwsd-nossl.conf) | 0 |
4 files changed, 0 insertions, 73 deletions
diff --git a/etc/apache2/loolwsd-ssl.conf b/etc/apache2/loolwsd-ssl.conf deleted file mode 100644 index 324ad445d5..0000000000 --- a/etc/apache2/loolwsd-ssl.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Apache2 reverse proxy configuration for Collabora Online / LibreOffice Online -# Internet <-- SSL --> Reverse Proxy <-- SSL --> loolwsd -# Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, proxy_http, and ssl. -# Create a virtual host for Collabora Online / LibreOffice Online and include this configuration file. - - Options -Indexes - - # Encoded slashes need to be allowed - AllowEncodedSlashes NoDecode - - # in most configurations loolwsd uses a self-signed certificate - SSLProxyEngine On - SSLProxyVerify None - SSLProxyCheckPeerCN Off - SSLProxyCheckPeerName Off - - # keep the host - ProxyPreserveHost On - - # static html, js, images, etc. served from loolwsd - # loleaflet is the client part of LibreOffice Online - ProxyPass /loleaflet https://127.0.0.1:9980/loleaflet retry=0 - ProxyPassReverse /loleaflet https://127.0.0.1:9980/loleaflet - - # WOPI discovery URL - ProxyPass /hosting/discovery https://127.0.0.1:9980/hosting/discovery retry=0 - ProxyPassReverse /hosting/discovery https://127.0.0.1:9980/hosting/discovery - - # Main websocket - ProxyPassMatch "/lool/(.*)/ws$" wss://127.0.0.1:9980/lool/$1/ws nocanon - - # Admin Console websocket - ProxyPass /lool/adminws wss://127.0.0.1:9980/lool/adminws - - # Download as, Fullscreen presentation and Image upload operations - ProxyPass /lool https://127.0.0.1:9980/lool - ProxyPassReverse /lool https://127.0.0.1:9980/lool diff --git a/etc/apache2/loolwsd-nossl.conf b/etc/apache2/loolwsd.conf index 10b66b47fa..10b66b47fa 100644 --- a/etc/apache2/loolwsd-nossl.conf +++ b/etc/apache2/loolwsd.conf diff --git a/etc/nginx/loolwsd-ssl.conf b/etc/nginx/loolwsd-ssl.conf deleted file mode 100644 index 279f23a5b1..0000000000 --- a/etc/nginx/loolwsd-ssl.conf +++ /dev/null @@ -1,36 +0,0 @@ - - # static files - location ^~ /loleaflet { - proxy_pass https://localhost:9980; - proxy_set_header Host $http_host; - } - - # WOPI discovery URL - location ^~ /hosting/discovery { - proxy_pass https://localhost:9980; - proxy_set_header Host $http_host; - } - - # main websocket - location ~ ^/lool/(.*)/ws$ { - proxy_pass https://localhost:9980; - 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 { - proxy_pass https://localhost:9980; - proxy_set_header Host $http_host; - } - - # Admin Console websocket - location ^~ /lool/adminws { - proxy_pass https://localhost:9980; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $http_host; - proxy_read_timeout 36000s; - } diff --git a/etc/nginx/loolwsd-nossl.conf b/etc/nginx/loolwsd.conf index f55f8829b4..f55f8829b4 100644 --- a/etc/nginx/loolwsd-nossl.conf +++ b/etc/nginx/loolwsd.conf |