Explorar el Código

Move dns settings to separate tor config file

Bob Mottram hace 7 años
padre
commit
5e80ab9df4
Se han modificado 2 ficheros con 11 adiciones y 20 borrados
  1. 3
    20
      src/freedombone-base-email
  2. 8
    0
      src/freedombone-utils-onion

+ 3
- 20
src/freedombone-base-email Ver fichero

320
       echo "  hosts_avoid_tls = *";
320
       echo "  hosts_avoid_tls = *";
321
       echo "  socks_proxy = 127.0.0.1 port=9050"; } > /etc/exim4/conf.d/transport/050_exim4-config_onion_relay
321
       echo "  socks_proxy = 127.0.0.1 port=9050"; } > /etc/exim4/conf.d/transport/050_exim4-config_onion_relay
322
 
322
 
323
-    if ! grep -q "AutomapHostsOnResolve" /etc/tor/torrc; then
324
-        echo 'AutomapHostsOnResolve 1' >> /etc/tor/torrc
325
-    else
326
-        sed -i 's|#AutomapHostsOnResolve.*|AutomapHostsOnResolve 1|g' /etc/tor/torrc
327
-        sed -i 's|AutomapHostsOnResolve.*|AutomapHostsOnResolve 1|g' /etc/tor/torrc
328
-    fi
329
-
330
-    if ! grep -q "DNSPort " /etc/tor/torrc; then
331
-        echo 'DNSPort 5300' >> /etc/tor/torrc
332
-    else
333
-        sed -i 's|#DNSPort .*|DNSPort 5300|g' /etc/tor/torrc
334
-        sed -i 's|DNSPort .*|DNSPort 5300|g' /etc/tor/torrc
335
-    fi
336
-
337
-    if ! grep -q "DNSListenAddress" /etc/tor/torrc; then
338
-        echo 'DNSListenAddress 127.0.0.1' >> /etc/tor/torrc
339
-    else
340
-        sed -i 's|#DNSListenAddress.*|DNSListenAddress 127.0.0.1|g' /etc/tor/torrc
341
-        sed -i 's|DNSListenAddress.*|DNSListenAddress 127.0.0.1|g' /etc/tor/torrc
342
-    fi
323
+    { echo 'DNSPort 5300';
324
+      echo 'DNSListenAddress 127.0.0.1';
325
+      echo 'AutomapHostsOnResolve 1'; } > /etc/torrc.d/dns
343
 
326
 
344
     update-exim4.conf.template -r
327
     update-exim4.conf.template -r
345
     update-exim4.conf
328
     update-exim4.conf

+ 8
- 0
src/freedombone-utils-onion Ver fichero

53
         echo "%include /etc/torrc.d" >> /etc/tor/torrc
53
         echo "%include /etc/torrc.d" >> /etc/tor/torrc
54
     fi
54
     fi
55
 
55
 
56
+    { echo 'DNSPort 5300';
57
+      echo 'DNSListenAddress 127.0.0.1';
58
+      echo 'AutomapHostsOnResolve 1'; } > /etc/torrc.d/dns
59
+
60
+    sed -i '/DNSPort 5300/d' /etc/tor/torrc
61
+    sed -i '/DNSListenAddress 127.0.0./d' /etc/tor/torrc
62
+    sed -i '/AutomapHostsOnResolve 1/d' /etc/tor/torrc
63
+
56
     systemctl restart tor
64
     systemctl restart tor
57
 }
65
 }
58
 
66