Use port 80

src/freedombone-app-matrix

@@ -348,9 +348,17 @@ function matrix_generate {
 }
 
 function create_matrix_user_removal_script {
+    read_config_param ONION_ONLY
     read_config_param MY_USERNAME
     read_config_param MATRIX_DOMAIN_NAME
 
+    curl_command='curl'
+    homebase="https://$MATRIX_DOMAIN_NAME"
+    if [[ "$ONION_ONLY" != 'no' ]]; then
+        curl_command='torsocks curl'
+        homebase="http://$(cat /var/lib/tor/hidden_service_matrix/hostname)"
+    fi
+
     matrix_remove_user=/usr/bin/matrix-remove-user
     { echo '#!/bin/bash';
       echo "cd $MATRIX_DATA_DIR";
@@ -360,7 +368,7 @@ function create_matrix_user_removal_script {
       echo "BUFFER=\$(sqlite3 homeserver.db \"\$BUSY;select token from access_tokens where user_id like '\$ADMIN' order by id desc limit 1;\")";
       echo "TOKEN=\$(echo \$BUFFER|awk '{print \$2}')";
       echo 'set -x';
-      echo "curl -X POST 'https://$MATRIX_DOMAIN_NAME/_matrix/client/r0/admin/deactivate/%40\$remove_username%3A$MATRIX_DOMAIN_NAME?access_token=\$TOKEN' --data '{}'"; } > $matrix_remove_user
+      echo "${curl_command} -X POST '${homebase}/_matrix/client/r0/admin/deactivate/%40\$remove_username%3A$MATRIX_DOMAIN_NAME?access_token=\$TOKEN' --data '{}'"; } > $matrix_remove_user
 
     chmod +x $matrix_remove_user
 }
@@ -689,7 +697,7 @@ function install_home_server {
     sqlite3 homeserver.db "PRAGMA auto_vacuum = FULL;"
 
     #MATRIX_ONION_HOSTNAME=$(add_onion_service matrix ${MATRIX_PORT} ${MATRIX_ONION_PORT})
-    add_onion_service matrix ${MATRIX_PORT} ${MATRIX_ONION_PORT}
+    add_onion_service matrix 80 ${MATRIX_ONION_PORT}
     echo "HiddenServicePort ${MATRIX_HTTP_PORT} 127.0.0.1:${MATRIX_FEDERATION_ONION_PORT}" >> "$ONION_SERVICES_FILE"
     systemctl restart tor