Bladeren bron

Option to force usage of v2 onion address

Hopefully this won't be needed for long
Bob Mottram 7 jaren geleden
bovenliggende
commit
3e03e30fd2
2 gewijzigde bestanden met toevoegingen van 8 en 1 verwijderingen
  1. 1
    0
      src/freedombone-app-rss
  2. 7
    1
      src/freedombone-utils-onion

+ 1
- 0
src/freedombone-app-rss Bestand weergeven

392
 
392
 
393
     sleep 2
393
     sleep 2
394
 
394
 
395
+    USE_V2_ONION_ADDRESS=1
395
     RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT})
396
     RSS_MOBILE_READER_ONION_HOSTNAME=$(add_onion_service mobilerss 80 ${RSS_MOBILE_READER_ONION_PORT})
396
 
397
 
397
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
398
     echo 'server {' > /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME

+ 7
- 1
src/freedombone-utils-onion Bestand weergeven

31
 # The maximum amount of traffic per day in gigabytes
31
 # The maximum amount of traffic per day in gigabytes
32
 TOR_MAX_TRAFFIC_PER_MONTH_GB=10
32
 TOR_MAX_TRAFFIC_PER_MONTH_GB=10
33
 
33
 
34
+USE_V2_ONION_ADDRESS=
34
 HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
35
 HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
35
 
36
 
36
 function add_email_hostname {
37
 function add_email_hostname {
124
     fi
125
     fi
125
     if ! grep -q "hidden_service_${onion_service_name}" /etc/tor/torrc; then
126
     if ! grep -q "hidden_service_${onion_service_name}" /etc/tor/torrc; then
126
         echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}${onion_service_name}/" >> /etc/tor/torrc
127
         echo "HiddenServiceDir ${HIDDEN_SERVICE_PATH}${onion_service_name}/" >> /etc/tor/torrc
127
-        echo 'HiddenServiceVersion 3' >> /etc/tor/torrc
128
+        if [ ! $USE_V2_ONION_ADDRESS ]; then
129
+            echo 'HiddenServiceVersion 3' >> /etc/tor/torrc
130
+        else
131
+            echo 'HiddenServiceVersion 2' >> /etc/tor/torrc
132
+            USE_V2_ONION_ADDRESS=
133
+        fi
128
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
134
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
129
         if [ ${#onion_stealth_name} -gt 0 ]; then
135
         if [ ${#onion_stealth_name} -gt 0 ]; then
130
             echo "HiddenServiceAuthorizeClient stealth ${onion_stealth_name}" >> /etc/tor/torrc
136
             echo "HiddenServiceAuthorizeClient stealth ${onion_stealth_name}" >> /etc/tor/torrc