Selaa lähdekoodia

hubzilla via onion only

Bob Mottram 9 vuotta sitten
vanhempi
commit
9b19f65362
1 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
  1. 13
    13
      src/freedombone

+ 13
- 13
src/freedombone Näytä tiedosto

@@ -9071,6 +9071,18 @@ function install_hubzilla {
9071 9071
     CURRENT_DDNS_DOMAIN=$HUBZILLA_DOMAIN_NAME
9072 9072
     add_ddns_domain
9073 9073
 
9074
+    HUBZILLA_ONION_HOSTNAME=
9075
+    if [[ $ONION_ONLY != "no" ]]; then
9076
+        HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT})
9077
+        if ! grep -q "Hubzilla onion domain" /home/$MY_USERNAME/README; then
9078
+            echo "Hubzilla onion domain: ${HUBZILLA_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
9079
+            echo '' >> /home/$MY_USERNAME/README
9080
+            chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
9081
+            chmod 600 /home/$MY_USERNAME/README
9082
+        fi
9083
+        echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE
9084
+    fi
9085
+
9074 9086
     if [[ $ONION_ONLY == "no" ]]; then
9075 9087
         nginx_http_redirect $HUBZILLA_DOMAIN_NAME
9076 9088
         echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -9148,7 +9160,7 @@ function install_hubzilla {
9148 9160
         echo 'server {' > /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9149 9161
         echo "    listen 127.0.0.1:${HUBZILLA_ONION_PORT} default_server;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9150 9162
         echo "    root $HUBZILLA_PATH;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9151
-        echo "    server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9163
+        echo "    server_name $HUBZILLA_ONION_HOSTNAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9152 9164
         echo "    error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9153 9165
         echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9154 9166
         echo '    charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -9252,18 +9264,6 @@ function install_hubzilla {
9252 9264
 
9253 9265
     nginx_ensite $HUBZILLA_DOMAIN_NAME
9254 9266
 
9255
-    HUBZILLA_ONION_HOSTNAME=
9256
-    if [[ $ONION_ONLY != "no" ]]; then
9257
-        HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT})
9258
-        if ! grep -q "Hubzilla onion domain" /home/$MY_USERNAME/README; then
9259
-            echo "Hubzilla onion domain: ${HUBZILLA_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
9260
-            echo '' >> /home/$MY_USERNAME/README
9261
-            chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
9262
-            chmod 600 /home/$MY_USERNAME/README
9263
-        fi
9264
-        echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE
9265
-    fi
9266
-
9267 9267
     # initialize the database
9268 9268
     if [ ! -f $HUBZILLA_PATH/install/schema_mysql.sql ]; then
9269 9269
         echo $'No database schema found for hubzilla'