From 4976d89b817e9ce018c8d8d2da14031c6c21b535 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 31 Dec 2018 09:44:44 +0000
Subject: [PATCH] Updating riot homeserver
---
src/freedombone-app-matrix | 9 +--------
src/freedombone-app-riot | 11 +++++++++++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 75b8f6a17..bc46d38cd 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -882,14 +882,7 @@ function matrix_update_riot_config {
if [ ! -d "/var/www/$RIOT_DOMAIN_NAME/htdocs" ]; then
return
fi
- if [ -f "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json" ]; then
- sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${RIOT_DOMAIN_NAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json"
- sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${RIOT_DOMAIN_NAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json"
- fi
- if [ -f "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json" ]; then
- sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${MATRIX_ONION_HOSTNAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json"
- sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${MATRIX_ONION_HOSTNAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json"
- fi
+ riot_set_default_homeserver
}
function install_matrix {
diff --git a/src/freedombone-app-riot b/src/freedombone-app-riot
index b7f450572..e6f288821 100755
--- a/src/freedombone-app-riot
+++ b/src/freedombone-app-riot
@@ -62,9 +62,20 @@ function riot_set_default_homeserver {
if [ ! "$MATRIX_DOMAIN_NAME" ]; then
read_config_param MATRIX_DOMAIN_NAME
fi
+
+ if [ -f "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json" ]; then
+ sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${RIOT_DOMAIN_NAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json"
+ sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${RIOT_DOMAIN_NAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$RIOT_DOMAIN_NAME.json"
+ fi
+
sed -i "s|https://matrix.org|https://$MATRIX_DOMAIN_NAME|g" /var/www/$RIOT_DOMAIN_NAME/htdocs/bundles/*/*.js
sed -i "s|https://vector.im|https://$MATRIX_DOMAIN_NAME|g" /var/www/$RIOT_DOMAIN_NAME/htdocs/bundles/*/*.js
else
+ if [ -f "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json" ]; then
+ sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${MATRIX_ONION_HOSTNAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json"
+ sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${MATRIX_ONION_HOSTNAME}\",|g" "/var/www/$RIOT_DOMAIN_NAME/htdocs/config.$MATRIX_ONION_HOSTNAME.json"
+ fi
+
if [ -f /var/lib/tor/hidden_service_matrix/hostname ]; then
MATRIX_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_matrix/hostname)
sed -i "s|https://matrix.org|http://$MATRIX_ONION_HOSTNAME|g" /var/www/$RIOT_DOMAIN_NAME/htdocs/bundles/*/*.js
--
GitLab