Bob Mottram пре 7 година
родитељ
комит
d076d70f88
1 измењених фајлова са 18 додато и 6 уклоњено
  1. 18
    6
      src/freedombone-app-riot

+ 18
- 6
src/freedombone-app-riot Прегледај датотеку

@@ -217,6 +217,9 @@ function install_riot {
217 217
         exit 827334
218 218
     fi
219 219
 
220
+    function_check get_completion_param
221
+    MATRIX_ONION_DOMAIN_NAME=$(get_completion_param "matrix onion domain")
222
+
220 223
     apt-get -yq install wget
221 224
 
222 225
     if [ ! -d /var/www/$RIOT_DOMAIN_NAME/htdocs ]; then
@@ -232,12 +235,21 @@ function install_riot {
232 235
     cd /var/www/$RIOT_DOMAIN_NAME/htdocs
233 236
     cp config.sample.json config.json
234 237
 
235
-    sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${MATRIX_DOMAIN_NAME}\",|g" config.json
236
-    sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${MATRIX_DOMAIN_NAME}\",|g" config.json
237
-    sed -i "s|\"integrations_ui_url\":.*|\"integrations_ui_url\": \"https://${MATRIX_DOMAIN_NAME}/\",|g" config.json
238
-    sed -i "s|\"integrations_rest_url\":.*|\"integrations_rest_url\": \"https://${MATRIX_DOMAIN_NAME}/api\",|g" config.json
239
-    sed -i "s|\"bug_report_endpoint_url\":.*|\"bug_report_endpoint_url\": \"https://${MATRIX_DOMAIN_NAME}/bugs\",|g" config.json
240
-    sed -i "/\"servers\":/a \"matrix.freedombone.net\"," config.json
238
+    if [[ $ONION_ONLY == 'no' ]]; then
239
+        sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"https://${MATRIX_DOMAIN_NAME}\",|g" config.json
240
+        sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"https://${MATRIX_DOMAIN_NAME}\",|g" config.json
241
+        sed -i "s|\"integrations_ui_url\":.*|\"integrations_ui_url\": \"https://${MATRIX_DOMAIN_NAME}/\",|g" config.json
242
+        sed -i "s|\"integrations_rest_url\":.*|\"integrations_rest_url\": \"https://${MATRIX_DOMAIN_NAME}/api\",|g" config.json
243
+        sed -i "s|\"bug_report_endpoint_url\":.*|\"bug_report_endpoint_url\": \"https://${MATRIX_DOMAIN_NAME}/bugs\",|g" config.json
244
+        sed -i "/\"servers\":/a \"${MATRIX_DOMAIN_NAME}\"," config.json
245
+    else
246
+        sed -i "s|\"default_hs_url\":.*|\"default_hs_url\": \"http://${MATRIX_ONION_DOMAIN_NAME}\",|g" config.json
247
+        sed -i "s|\"default_is_url\":.*|\"default_is_url\": \"http://${MATRIX_ONION_DOMAIN_NAME}\",|g" config.json
248
+        sed -i "s|\"integrations_ui_url\":.*|\"integrations_ui_url\": \"http://${MATRIX_ONION_DOMAIN_NAME}/\",|g" config.json
249
+        sed -i "s|\"integrations_rest_url\":.*|\"integrations_rest_url\": \"http://${MATRIX_ONION_DOMAIN_NAME}/api\",|g" config.json
250
+        sed -i "s|\"bug_report_endpoint_url\":.*|\"bug_report_endpoint_url\": \"http://${MATRIX_ONION_DOMAIN_NAME}/bugs\",|g" config.json
251
+        sed -i "/\"servers\":/a \"${MATRIX_ONION_DOMAIN_NAME}\"," config.json
252
+    fi
241 253
 
242 254
     RIOT_ONION_HOSTNAME=$(add_onion_service riot 80 ${RIOT_ONION_PORT})
243 255