summary refs log tree commit diff
path: root/docs/reverse_proxy.md
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2020-09-28 11:11:57 +0100
committerGitHub <noreply@github.com>2020-09-28 11:11:57 +0100
commit6201ea56eeae22258d58db2f7381f96759f5e85e (patch)
tree37cb630a46fe96e416110de253ad50d256c0482e /docs/reverse_proxy.md
parentAdd support for device messages, start support for device lists (diff)
parenttypo (diff)
downloadsynapse-6201ea56eeae22258d58db2f7381f96759f5e85e.tar.xz
Merge branch 'develop' into hs/super-wip-edus-down-sync
Diffstat (limited to 'docs/reverse_proxy.md')
-rw-r--r--docs/reverse_proxy.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md
index edd109fa7b..46d8f35771 100644
--- a/docs/reverse_proxy.md
+++ b/docs/reverse_proxy.md
@@ -121,6 +121,14 @@ example.com:8448 {
 
 **NOTE**: ensure the  `nocanon` options are included.
 
+**NOTE 2**: It appears that Synapse is currently incompatible with the ModSecurity module for Apache (`mod_security2`). If you need it enabled for other services on your web server, you can disable it for Synapse's two VirtualHosts by including the following lines before each of the two `</VirtualHost>` above:
+
+```
+<IfModule security2_module>
+    SecRuleEngine off
+</IfModule>
+```
+
 ### HAProxy
 
 ```