Bob Mottram пре 8 година
родитељ
комит
d441d19470
1 измењених фајлова са 10 додато и 5 уклоњено
  1. 10
    5
      src/freedombone-utils-onion

+ 10
- 5
src/freedombone-utils-onion Прегледај датотеку

28
 # You should have received a copy of the GNU Affero General Public License
28
 # You should have received a copy of the GNU Affero General Public License
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
 
30
 
31
+function onion_update {
32
+    # update so that new onion services appear
33
+    systemctl reload tor
34
+}
35
+
31
 function onion_service_exists {
36
 function onion_service_exists {
32
     onion_service_name="$1"
37
     onion_service_name="$1"
33
 
38
 
57
     wait_for_onion_service_base ${onion_service_name}
62
     wait_for_onion_service_base ${onion_service_name}
58
 
63
 
59
     if [ $(onion_service_exists ${onion_service_name}) == "0" ]; then
64
     if [ $(onion_service_exists ${onion_service_name}) == "0" ]; then
60
-        # reload and try a second time
61
-        systemctl reload tor
65
+        # try a second time
66
+        onion_update
62
         wait_for_onion_service_base ${onion_service_name}
67
         wait_for_onion_service_base ${onion_service_name}
63
     fi
68
     fi
64
 }
69
 }
81
         shred -zu /var/lib/tor/hidden_service_${onion_service_name}/*
86
         shred -zu /var/lib/tor/hidden_service_${onion_service_name}/*
82
         rm -rf /var/lib/tor/hidden_service_${onion_service_name}
87
         rm -rf /var/lib/tor/hidden_service_${onion_service_name}
83
     fi
88
     fi
84
-    systemctl reload tor
89
+    onion_update
85
 }
90
 }
86
 
91
 
87
 function add_onion_service {
92
 function add_onion_service {
103
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
108
         echo "HiddenServicePort ${onion_service_port_from} 127.0.0.1:${onion_service_port_to}" >> /etc/tor/torrc
104
     fi
109
     fi
105
 
110
 
106
-    systemctl reload tor
111
+    onion_update
107
 
112
 
108
     function_check wait_for_onion_service
113
     function_check wait_for_onion_service
109
     wait_for_onion_service ${onion_service_name}
114
     wait_for_onion_service ${onion_service_name}
252
         echo 'DNSPort 53' >> /etc/tor/torrc
257
         echo 'DNSPort 53' >> /etc/tor/torrc
253
         echo 'AutomapHostsOnResolve 1' >> /etc/tor/torrc
258
         echo 'AutomapHostsOnResolve 1' >> /etc/tor/torrc
254
         echo 'AutomapHostsSuffixes .exit,.onion' >> /etc/tor/torrc
259
         echo 'AutomapHostsSuffixes .exit,.onion' >> /etc/tor/torrc
255
-        systemctl reload tor
260
+        onion_update
256
     fi
261
     fi
257
 
262
 
258
     # don't change resolv.conf
263
     # don't change resolv.conf