fixed ip issueing
This commit is contained in:
@@ -172,48 +172,51 @@
|
|||||||
|
|
||||||
ProxyPreserveHost On
|
ProxyPreserveHost On
|
||||||
|
|
||||||
# Required: without this, mod_proxy refuses to initiate TLS to
|
# NOTE: coolwsd is configured with `ssl.termination true`
|
||||||
# the backend at all (AH01961/AH00961 "failed to enable ssl
|
# (see the "Configure Collabora CODE to disable SSL" task),
|
||||||
# support"), even though SSLEngine on above enables TLS for the
|
# which tells coolwsd to expect a TLS-terminating proxy in
|
||||||
# *client-facing* side of the connection. SSLEngine on does not
|
# front of it and to speak PLAIN HTTP/WS on 127.0.0.1:9980
|
||||||
# imply SSLProxyEngine on - they control opposite directions.
|
# itself. Apache must therefore proxy to it over http/ws, not
|
||||||
SSLProxyEngine On
|
# https/wss - proxying https to a plaintext backend produces
|
||||||
|
# "500 Proxy Error: Error during SSL Handshake with remote
|
||||||
# cert is issued for collaboraonline.example.com and we proxy to localhost
|
# server" because Apache sends a TLS ClientHello to a socket
|
||||||
SSLProxyVerify None
|
# that never speaks TLS.
|
||||||
SSLProxyCheckPeerCN Off
|
#
|
||||||
SSLProxyCheckPeerName Off
|
# If you ever flip coolconfig back to `ssl.enable true` /
|
||||||
|
# `ssl.termination false` (coolwsd terminates its own TLS),
|
||||||
|
# switch every ProxyPass/ProxyPassReverse target below back
|
||||||
|
# to https/wss and restore SSLProxyEngine On plus the
|
||||||
|
# SSLProxyVerify/CheckPeerCN/CheckPeerName directives.
|
||||||
|
|
||||||
# static html, js, images, etc. served from coolwsd
|
# static html, js, images, etc. served from coolwsd
|
||||||
# browser is the client part of Collabora Online
|
# browser is the client part of Collabora Online
|
||||||
ProxyPass /browser https://127.0.0.1:9980/browser retry=0
|
ProxyPass /browser http://127.0.0.1:9980/browser retry=0
|
||||||
ProxyPassReverse /browser https://127.0.0.1:9980/browser
|
ProxyPassReverse /browser http://127.0.0.1:9980/browser
|
||||||
|
|
||||||
|
|
||||||
# WOPI discovery URL
|
# WOPI discovery URL
|
||||||
ProxyPass /hosting/discovery https://127.0.0.1:9980/hosting/discovery retry=0
|
ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0
|
||||||
ProxyPassReverse /hosting/discovery https://127.0.0.1:9980/hosting/discovery
|
ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery
|
||||||
|
|
||||||
|
|
||||||
# Capabilities
|
# Capabilities
|
||||||
ProxyPass /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities retry=0
|
ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0
|
||||||
ProxyPassReverse /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities
|
ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities
|
||||||
|
|
||||||
# Main websocket (legacy URL, with the document path encoded into it)
|
# Main websocket (legacy URL, with the document path encoded into it)
|
||||||
ProxyPassMatch "/cool/(.*)/ws$" wss://127.0.0.1:9980/cool/$1/ws nocanon
|
ProxyPassMatch "/cool/(.*)/ws$" ws://127.0.0.1:9980/cool/$1/ws nocanon
|
||||||
|
|
||||||
# Main websocket (compact URL, used since 26.04, with the document passed via the WOPISrc query parameter)
|
# Main websocket (compact URL, used since 26.04, with the document passed via the WOPISrc query parameter)
|
||||||
ProxyPass /cool/ws wss://127.0.0.1:9980/cool/ws nocanon
|
ProxyPass /cool/ws ws://127.0.0.1:9980/cool/ws nocanon
|
||||||
|
|
||||||
|
|
||||||
# Admin Console websocket
|
# Admin Console websocket
|
||||||
ProxyPass /cool/adminws wss://127.0.0.1:9980/cool/adminws
|
ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws
|
||||||
|
|
||||||
|
|
||||||
# Download as, presentation (legacy svg) and image upload operations
|
# Download as, presentation (legacy svg) and image upload operations
|
||||||
ProxyPass /cool https://127.0.0.1:9980/cool
|
ProxyPass /cool http://127.0.0.1:9980/cool
|
||||||
ProxyPassReverse /cool https://127.0.0.1:9980/cool
|
ProxyPassReverse /cool http://127.0.0.1:9980/cool
|
||||||
|
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
SSLCertificateFile {{ cc_ssl_cert }}
|
SSLCertificateFile {{ cc_ssl_cert }}
|
||||||
|
|||||||
Reference in New Issue
Block a user