nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

matrixsynapse: Fix apache syntax errors introduce by 4b8b2e171c86d75

Browse Source 
This reverts the additional changes done in merge request !1540 and sets the
configuration to what was originally proposed in the merge request.

- AllowEncodedSlashes can't be set inside <Location> directive. It needs to be
  set inside VirtualHost directive making it apply for the entire site. In case
  of FreedomBox, this needs to be set globally. It may have implications for how
  we are encoding slashes in URLs include for storage module. It could cause
  unexpected regressions elsewhere.

- ProxyPass directory should have only argument inside a <Location> directive.
  Fix that too.

Closes: #1635.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2019-08-24 21:18:21 -07:00 committed by James Valleroy
parent dec215851b
commit 696ce3b6a5
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf
View File

@ -5,8 +5,5 @@
## 8448. Further, federation requires same TLS public key to be provided to
## Apache and Matrix Synapse server.
##
<Location "/_matrix">
AllowEncodedSlashes NoDecode
ProxyPass /_matrix http://localhost:8008/_matrix nocanon
ProxyPassReverse /_matrix http://localhost:8008/_matrix
</Location>
ProxyPass /_matrix http://localhost:8008/_matrix nocanon
ProxyPassReverse /_matrix http://localhost:8008/_matrix