From 55294ef4654decc73f7900979a4331e0ee3a598f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 30 Dec 2016 22:11:17 +0000
Subject: [PATCH] Remove matrix nginx entry
---
src/freedombone-app-matrix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 9db2cad0a..c7247a83f 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -48,10 +48,10 @@ matrix_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME)
function matrix_nginx {
- matrix_proxy_str='
- location /matrix {
- proxy_pass https://localhost:8448;
- proxy_buffering on;
+ matrix_proxy_str=' \
+ location /matrix { \
+ proxy_pass https://localhost:8448; \
+ proxy_buffering on; \
}'
if [ ! -f /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} ]; then
@@ -364,6 +364,9 @@ function remove_matrix {
delgroup matrix
remove_onion_service matrix ${MATRIX_PORT}
+ sed -i "/location \/matrix {/,/}/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
+ systemctl restart nginx
+
remove_completion_param install_matrix
sed -i '/matrix/d' $COMPLETION_FILE
}
--
GitLab