summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorColin W <cwmke@users.noreply.github.com>2018-09-02 17:30:07 -0500
committerGitHub <noreply@github.com>2018-09-02 17:30:07 -0500
commita395f1ddb3133134525ac5ae94ff03d94c95dfe6 (patch)
tree2637e8b54f8c7ef4a399589a229e909c2dfae2bc /README.rst
parentMerge pull request #3777 from matrix-org/neilj/fix_register_user_registration (diff)
downloadsynapse-a395f1ddb3133134525ac5ae94ff03d94c95dfe6.tar.xz
Update readme on develop branch
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index 4c5971d043..46498a7ee0 100644
--- a/README.rst
+++ b/README.rst
@@ -747,6 +747,18 @@ so an example nginx configuration might look like::
       }
   }
 
+and an example apache configuration may look like::
+
+    <VirtualHost *:443>
+        SSLEngine on
+        ServerName matrix.example.com;
+
+        <Location /_matrix>
+            ProxyPass http://127.0.0.1:8008/_matrix/ nocanon
+            ProxyPassReverse http://127.0.0.1:8008/_matrix/
+        </Location>
+    </VirtualHost>
+
 You will also want to set ``bind_addresses: ['127.0.0.1']`` and ``x_forwarded: true``
 for port 8008 in ``homeserver.yaml`` to ensure that client IP addresses are
 recorded correctly.