From 840c7d652dca2d6648725241fa4fce2a1f4c603e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 30 Dec 2016 23:57:44 +0000 Subject: [PATCH] Sleep anyway --- src/freedombone-app-matrix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index a39e0165..3e43daf4 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -48,7 +48,6 @@ matrix_variables=(ONION_ONLY DEFAULT_DOMAIN_NAME) function matrix_nginx { - matrix_changed= matrix_proxy_str=' \ location /matrix { \ proxy_pass https://localhost:8448; \ @@ -148,26 +147,21 @@ function matrix_nginx { fi nginx_ensite $DEFAULT_DOMAIN_NAME - matrix_changed=1 fi if ! grep "localhost:${MATRIX_PORT}" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}; then sed -i "s|:443 ssl;|:443 ssl;${matrix_proxy_str}|g" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} sed -i "s| default_server;| default_server;${matrix_proxy_str}|g" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} - matrix_changed=1 fi if ! grep "localhost:${TURN_PORT}" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}; then sed -i "s|:443 ssl;|:443 ssl;${turn_proxy_str}|g" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} sed -i "s| default_server;| default_server;${turn_proxy_str}|g" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} - matrix_changed=1 fi - if [ $matrix_changed ]; then - systemctl restart nginx - # wait for nginx to start otherwise user add fails later - sleep 5 - fi + systemctl restart nginx + # wait for nginx to start otherwise user add fails later + sleep 5 } function matrix_generate_synapse_file {