'loolwsd' service was (changed and) renamed to 'coolwsd'. so we add example vhos configuration (Proxy settings) for Apache2 and also Ngins webserver.
This commit is contained in:
parent
39f31af175
commit
f2db40968b
@ -1,3 +1,20 @@
|
|||||||
|
|
||||||
|
# Required Apache2 modules
|
||||||
|
# ========================
|
||||||
|
#
|
||||||
|
# Apache2 web server is modular. We need to enable the required modules for this reverse
|
||||||
|
# proxy setup. We can use the a2enmod command to enable modules. If a module has been
|
||||||
|
# enabled already, nothing happens.
|
||||||
|
#
|
||||||
|
# Enable proxy in general: a2enmod proxy
|
||||||
|
#
|
||||||
|
# Enable proxy for HTTP protocol: a2enmod proxy_http
|
||||||
|
#
|
||||||
|
# Enable SSL support: a2enmod proxy_connect
|
||||||
|
#
|
||||||
|
# Enable proxy of websockets: a2enmod proxy_wstunnel
|
||||||
|
|
||||||
|
|
||||||
<VirtualHost <IPV4-ADDRESS>:443 [IPV6-ADDRESS]:443>
|
<VirtualHost <IPV4-ADDRESS>:443 [IPV6-ADDRESS]:443>
|
||||||
|
|
||||||
ServerName <FULL-QUALIFIED-SITE-NAME>
|
ServerName <FULL-QUALIFIED-SITE-NAME>
|
||||||
@ -16,33 +33,38 @@
|
|||||||
# keep the host
|
# keep the host
|
||||||
ProxyPreserveHost On
|
ProxyPreserveHost On
|
||||||
|
|
||||||
# static html, js, images, etc. served from loolwsd
|
|
||||||
# loleaflet is the client part of Collabora Online
|
# static html, js, images, etc. served from coolwsd
|
||||||
ProxyPass /loleaflet https://localhost:9980/loleaflet retry=0
|
# browser is the client part of Collabora Online
|
||||||
ProxyPassReverse /loleaflet https://localhost:9980/loleaflet
|
ProxyPass /browser https://127.0.0.1:9980/browser retry=0
|
||||||
|
ProxyPassReverse /browser https://127.0.0.1:9980/browser
|
||||||
|
|
||||||
|
|
||||||
# WOPI discovery URL
|
# WOPI discovery URL
|
||||||
ProxyPass /hosting/discovery https://localhost:9980/hosting/discovery retry=0
|
ProxyPass /hosting/discovery https://127.0.0.1:9980/hosting/discovery retry=0
|
||||||
ProxyPassReverse /hosting/discovery https://localhost:9980/hosting/discovery
|
ProxyPassReverse /hosting/discovery https://127.0.0.1:9980/hosting/discovery
|
||||||
|
|
||||||
|
|
||||||
# Capabilities
|
# Capabilities
|
||||||
ProxyPass /hosting/capabilities https://localhost:9980/hosting/capabilities retry=0
|
ProxyPass /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities retry=0
|
||||||
ProxyPassReverse /hosting/capabilities https://localhost:9980/hosting/capabilities
|
ProxyPassReverse /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities
|
||||||
|
|
||||||
# Main websocket
|
# Main websocket
|
||||||
ProxyPassMatch "/lool/(.*)/ws$" wss://localhost:9980/lool/$1/ws nocanon
|
ProxyPassMatch "/cool/(.*)/ws$" wss://127.0.0.1:9980/cool/$1/ws nocanon
|
||||||
|
|
||||||
|
|
||||||
# Admin Console websocket
|
# Admin Console websocket
|
||||||
ProxyPass /lool/adminws wss://localhost:9980/lool/adminws
|
ProxyPass /cool/adminws wss://127.0.0.1:9980/cool/adminws
|
||||||
|
|
||||||
|
|
||||||
# Download as, Fullscreen presentation and Image upload operations
|
# Download as, Fullscreen presentation and Image upload operations
|
||||||
ProxyPass /lool https://localhost:9980/lool
|
ProxyPass /cool https://127.0.0.1:9980/cool
|
||||||
ProxyPassReverse /lool https://localhost:9980/lool
|
ProxyPassReverse /cool https://127.0.0.1:9980/cool
|
||||||
|
|
||||||
|
|
||||||
# Endpoint with information about availability of various features
|
# Compatibility with integrations that use the /lool/convert-to endpoint
|
||||||
ProxyPass /hosting/capabilities https://localhost:9980/hosting/capabilities retry=0
|
ProxyPass /lool https://127.0.0.1:9980/cool
|
||||||
ProxyPassReverse /hosting/capabilities https://localhost:9980/hosting/capabilities
|
ProxyPassReverse /lool https://127.0.0.1:9980/cool
|
||||||
|
|
||||||
|
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
|
@ -0,0 +1,58 @@
|
|||||||
|
<VirtualHost <IPV4-ADDRESS>:443 [IPV6-ADDRESS]:443>
|
||||||
|
|
||||||
|
ServerName <FULL-QUALIFIED-SITE-NAME>
|
||||||
|
|
||||||
|
Options -Indexes
|
||||||
|
|
||||||
|
# Encoded slashes need to be allowed
|
||||||
|
AllowEncodedSlashes NoDecode
|
||||||
|
|
||||||
|
# Container uses a unique non-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 Collabora Online
|
||||||
|
ProxyPass /loleaflet https://localhost:9980/loleaflet retry=0
|
||||||
|
ProxyPassReverse /loleaflet https://localhost:9980/loleaflet
|
||||||
|
|
||||||
|
# WOPI discovery URL
|
||||||
|
ProxyPass /hosting/discovery https://localhost:9980/hosting/discovery retry=0
|
||||||
|
ProxyPassReverse /hosting/discovery https://localhost:9980/hosting/discovery
|
||||||
|
|
||||||
|
# Capabilities
|
||||||
|
ProxyPass /hosting/capabilities https://localhost:9980/hosting/capabilities retry=0
|
||||||
|
ProxyPassReverse /hosting/capabilities https://localhost:9980/hosting/capabilities
|
||||||
|
|
||||||
|
# Main websocket
|
||||||
|
ProxyPassMatch "/lool/(.*)/ws$" wss://localhost:9980/lool/$1/ws nocanon
|
||||||
|
|
||||||
|
# Admin Console websocket
|
||||||
|
ProxyPass /lool/adminws wss://localhost:9980/lool/adminws
|
||||||
|
|
||||||
|
# Download as, Fullscreen presentation and Image upload operations
|
||||||
|
ProxyPass /lool https://localhost:9980/lool
|
||||||
|
ProxyPassReverse /lool https://localhost:9980/lool
|
||||||
|
|
||||||
|
|
||||||
|
# Endpoint with information about availability of various features
|
||||||
|
ProxyPass /hosting/capabilities https://localhost:9980/hosting/capabilities retry=0
|
||||||
|
ProxyPassReverse /hosting/capabilities https://localhost:9980/hosting/capabilities
|
||||||
|
|
||||||
|
|
||||||
|
SSLEngine on
|
||||||
|
|
||||||
|
SSLCertificateFile /var/lib/dehydrated/certs/<FULL-QUALIFIED-SITE-NAME>/fullchain.pem
|
||||||
|
SSLCertificateKeyFile /var/lib/dehydrated/certs/<FULL-QUALIFIED-SITE-NAME>/privkey.pem
|
||||||
|
|
||||||
|
CustomLog /var/log/apache2/ip_requests.log base_requests
|
||||||
|
|
||||||
|
CustomLog /var/log/apache2/<FULL-QUALIFIED-SITE-NAME>.log combined
|
||||||
|
ErrorLog /var/log/apache2/<FULL-QUALIFIED-SITE-NAME>-error.log
|
||||||
|
|
||||||
|
</VirtualHost>
|
@ -36,42 +36,48 @@ server {
|
|||||||
client_max_body_size 512M;
|
client_max_body_size 512M;
|
||||||
fastcgi_buffers 64 4K;
|
fastcgi_buffers 64 4K;
|
||||||
|
|
||||||
|
|
||||||
# static files
|
# static files
|
||||||
location ^~ /loleaflet {
|
location ^~ /browser {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# WOPI discovery URL
|
# WOPI discovery URL
|
||||||
location ^~ /hosting/discovery {
|
location ^~ /hosting/discovery {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Capabilities
|
# Capabilities
|
||||||
location ^~ /hosting/capabilities {
|
location ^~ /hosting/capabilities {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# main websocket
|
# main websocket
|
||||||
location ~ ^/lool/(.*)/ws$ {
|
location ~ ^/cool/(.*)/ws$ {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "Upgrade";
|
proxy_set_header Connection "Upgrade";
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_read_timeout 36000s;
|
proxy_read_timeout 36000s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# download, presentation and image upload
|
# download, presentation and image upload
|
||||||
location ~ ^/lool {
|
location ~ ^/(c|l)ool {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Admin Console websocket
|
# Admin Console websocket
|
||||||
location ^~ /lool/adminws {
|
location ^~ /cool/adminws {
|
||||||
proxy_pass https://localhost:9980;
|
proxy_pass https://127.0.0.1:9980;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "Upgrade";
|
proxy_set_header Connection "Upgrade";
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
|
80
FILES/Nginx/colaboraonline-site-name.conf.static.ALT-loolwsd
Normal file
80
FILES/Nginx/colaboraonline-site-name.conf.static.ALT-loolwsd
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
# --- <FULL-QUALIFIED-SITE-NAME>
|
||||||
|
|
||||||
|
# ---
|
||||||
|
# see: https://www.collaboraoffice.com/code/nginx-reverse-proxy/
|
||||||
|
# ---
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name <FULL-QUALIFIED-SITE-NAME>;
|
||||||
|
|
||||||
|
# Enforce HTTPS
|
||||||
|
return 301 https://$server_name$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
|
||||||
|
server_name <FULL-QUALIFIED-SITE-NAME>;
|
||||||
|
|
||||||
|
root /var/www/<FULL-QUALIFIED-SITE-NAME>;
|
||||||
|
|
||||||
|
ssl_certificate /var/lib/dehydrated/certs/<FULL-QUALIFIED-SITE-NAME>/fullchain.pem;
|
||||||
|
ssl_certificate_key /var/lib/dehydrated/certs/<FULL-QUALIFIED-SITE-NAME>/privkey.pem;
|
||||||
|
|
||||||
|
|
||||||
|
# Include location directive for Let's Encrypt ACME Challenge
|
||||||
|
#
|
||||||
|
# Needed for (automated) updating certificate
|
||||||
|
#
|
||||||
|
include snippets/letsencrypt-acme-challenge.conf;
|
||||||
|
|
||||||
|
# set max upload size
|
||||||
|
client_max_body_size 512M;
|
||||||
|
fastcgi_buffers 64 4K;
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Capabilities
|
||||||
|
location ^~ /hosting/capabilities {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user