From 696ce3b6a501cb266b9dc2db551d07cd79382a73 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 24 Aug 2019 21:18:21 -0700 Subject: [PATCH] matrixsynapse: Fix apache syntax errors introduce by 4b8b2e171c86d75 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 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 directive. Fix that too. Closes: #1635. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../etc/apache2/conf-available/matrix-synapse-plinth.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf b/plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf index 292ef44ce..de4b878b5 100644 --- a/plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf +++ b/plinth/modules/matrixsynapse/data/etc/apache2/conf-available/matrix-synapse-plinth.conf @@ -5,8 +5,5 @@ ## 8448. Further, federation requires same TLS public key to be provided to ## Apache and Matrix Synapse server. ## - - AllowEncodedSlashes NoDecode - ProxyPass /_matrix http://localhost:8008/_matrix nocanon - ProxyPassReverse /_matrix http://localhost:8008/_matrix - +ProxyPass /_matrix http://localhost:8008/_matrix nocanon +ProxyPassReverse /_matrix http://localhost:8008/_matrix