Bob Mottram 10 år sedan
förälder
incheckning
b94ac8ab22
1 ändrade filer med 18 tillägg och 5 borttagningar
  1. 18
    5
      install-freedombone.sh

+ 18
- 5
install-freedombone.sh Visa fil

@@ -7017,7 +7017,7 @@ function route_outgoing_traffic_through_tor {
7017 7017
 
7018 7018
   echo 'domain localdomain' > /etc/resolv.conf
7019 7019
   echo 'search localdomain' >> /etc/resolv.conf
7020
-  echo "nameserver $WIFI_STATIC_IP_ADDRESS" >> /etc/resolv.conf
7020
+  echo "nameserver localhost" >> /etc/resolv.conf
7021 7021
 
7022 7022
 
7023 7023
   if ! grep -q 'Log notice file /var/log/tor/notices.log' /etc/tor/torrc; then
@@ -7040,16 +7040,16 @@ function route_outgoing_traffic_through_tor {
7040 7040
       echo 'TransPort 9040' >> /etc/tor/torrc
7041 7041
   fi
7042 7042
 
7043
-  if ! grep -q "TransListenAddress $WIFI_STATIC_IP_ADDRESS" /etc/tor/torrc; then
7044
-      echo "TransListenAddress $WIFI_STATIC_IP_ADDRESS" >> /etc/tor/torrc
7043
+  if ! grep -q "TransListenAddress localhost" /etc/tor/torrc; then
7044
+      echo "TransListenAddress localhost" >> /etc/tor/torrc
7045 7045
   fi
7046 7046
 
7047 7047
   if ! grep -q "DNSPort" /etc/tor/torrc; then
7048 7048
       echo 'DNSPort 53' >> /etc/tor/torrc
7049 7049
   fi
7050 7050
 
7051
-  if ! grep -q "DNSListenAddress $WIFI_STATIC_IP_ADDRESS" /etc/tor/torrc; then
7052
-      echo "DNSListenAddress $WIFI_STATIC_IP_ADDRESS" >> /etc/tor/torrc
7051
+  if ! grep -q "DNSListenAddress localhost" /etc/tor/torrc; then
7052
+      echo "DNSListenAddress localhost" >> /etc/tor/torrc
7053 7053
   fi
7054 7054
 
7055 7055
   touch /var/log/tor/notices.log
@@ -7059,6 +7059,19 @@ function route_outgoing_traffic_through_tor {
7059 7059
   echo 'route_outgoing_traffic_through_tor' >> $COMPLETION_FILE
7060 7060
 
7061 7061
   if [[ $ENABLE_WIFI_HOTSPOT == "yes" ]]; then
7062
+      if ! grep -q 'check.torproject.org' /home/$MY_USERNAME/README; then
7063
+          echo '' >> /home/$MY_USERNAME/README
7064
+          echo '' >> /home/$MY_USERNAME/README
7065
+          echo 'To connect to your own Tor gateway, set your web browser or computer to connect to:' >> /home/$MY_USERNAME/README
7066
+          echo '  Proxy type: SOCKSv5' >> /home/$MY_USERNAME/README
7067
+          echo '  Port:       9050' >> /home/$MY_USERNAME/README
7068
+          echo '' >> /home/$MY_USERNAME/README
7069
+          echo '  Transparent proxy port: 9040' >> /home/$MY_USERNAME/README
7070
+          echo '' >> /home/$MY_USERNAME/README
7071
+          echo 'Before doing anything, verify that you are using the Tor network by visiting:' >> /home/$MY_USERNAME/README
7072
+          echo '' >> /home/$MY_USERNAME/README
7073
+          echo '  https://check.torproject.org/' >> /home/$MY_USERNAME/README
7074
+      fi
7062 7075
       echo ''
7063 7076
       echo '  *** Freedombone Tor Wifi access point installation is complete. Rebooting... ***'
7064 7077
       echo ''