From a849abc185dd0c9fc46bccf12a3a02660a871d76 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 4 May 2017 11:31:14 +0100 Subject: [PATCH] Matrix tweaks to bring into line with debian package config --- src/freedombone-app-matrix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index 3ef4a1d7..b3170d3c 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -242,11 +242,12 @@ function matrix_configure_homeserver_yaml { sed -i "s|pid_file:.*|pid_file: \"${MATRIX_DATA_DIR}/homeserver.pid\"|g" "${filepath}" sed -i "s|log_file:.*|log_file: \"/dev/null\"|g" "${filepath}" sed -i 's|bind_address:.*|bind_address: 127.0.0.1|g' "${filepath}" - sed -i '0,/x_forwarded:.*/s//x_forwarded: true/' "${filepath}" + sed -i "s|bind_addresses:.*|bind_addresses: ['127.0.0.1']|g" "${filepath}" + sed -i 's|x_forwarded:.*|x_forwarded: false|g' "${filepath}" sed -i "s|server_name:.*|server_name: \"${MATRIX_DOMAIN_NAME}\"|g" "${filepath}" sed -i "/trusted_third_party_id_servers:/a - ${MATRIX_DOMAIN_NAME}" "${filepath}" sed -i "s|- ${MATRIX_DOMAIN_NAME}| - ${MATRIX_DOMAIN_NAME}|g" "${filepath}" - sed -i "s|enable_registration:.*|enable_registration: True|g" "${filepath}" + sed -i "s|enable_registration:.*|enable_registration: False|g" "${filepath}" } function matrix_configure_identityserver { @@ -681,9 +682,6 @@ function install_home_server { # Disable the web client sed -i 's|web_client:.*|web_client: False|g' $MATRIX_DATA_DIR/homeserver.yaml - if ! grep "#- webclient" $MATRIX_DATA_DIR/homeserver.yaml; then - sed -i 's|- webclient.*|#- webclient|g' $MATRIX_DATA_DIR/homeserver.yaml - fi sed -i 's|, webclient||g' $MATRIX_DATA_DIR/homeserver.yaml chmod -R 700 $MATRIX_DATA_DIR/homeserver.yaml