Add dnsmasq DNS caching and performance tune tor instances

2018-09-10 19:11:02 +02:00
parent 156a66a3ff
commit 2c634b889c
35 changed files with 108 additions and 4 deletions
--- a/etc/dnsmasq.d/custom
+++ b/etc/dnsmasq.d/custom
@ -0,0 +1,5 @@
+interface=*
+server=127.0.0.1#54
+no-resolv
+cache-size=10000
+
--- a/etc/tor/instances/2/torrc
+++ b/etc/tor/instances/2/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/3/torrc
+++ b/etc/tor/instances/3/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/4/torrc
+++ b/etc/tor/instances/4/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/5/torrc
+++ b/etc/tor/instances/5/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/6/torrc
+++ b/etc/tor/instances/6/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/7/torrc
+++ b/etc/tor/instances/7/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/a/torrc
+++ b/etc/tor/instances/a/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/b/torrc
+++ b/etc/tor/instances/b/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/c/torrc
+++ b/etc/tor/instances/c/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/d/torrc
+++ b/etc/tor/instances/d/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/e/torrc
+++ b/etc/tor/instances/e/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/f/torrc
+++ b/etc/tor/instances/f/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/g/torrc
+++ b/etc/tor/instances/g/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/h/torrc
+++ b/etc/tor/instances/h/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/i/torrc
+++ b/etc/tor/instances/i/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/j/torrc
+++ b/etc/tor/instances/j/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/k/torrc
+++ b/etc/tor/instances/k/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/l/torrc
+++ b/etc/tor/instances/l/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/m/torrc
+++ b/etc/tor/instances/m/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/n/torrc
+++ b/etc/tor/instances/n/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/o/torrc
+++ b/etc/tor/instances/o/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/p/torrc
+++ b/etc/tor/instances/p/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/q/torrc
+++ b/etc/tor/instances/q/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/r/torrc
+++ b/etc/tor/instances/r/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/s/torrc
+++ b/etc/tor/instances/s/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/t/torrc
+++ b/etc/tor/instances/t/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/u/torrc
+++ b/etc/tor/instances/u/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/v/torrc
+++ b/etc/tor/instances/v/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/w/torrc
+++ b/etc/tor/instances/w/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/x/torrc
+++ b/etc/tor/instances/x/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/y/torrc
+++ b/etc/tor/instances/y/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/instances/z/torrc
+++ b/etc/tor/instances/z/torrc
@ -1,4 +1,7 @@
+ClientUseIPv6 1
+ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6
--- a/etc/tor/torrc
+++ b/etc/tor/torrc
@ -58,15 +58,18 @@ HiddenServicePort 5047
 HiddenServicePort 5048
 HiddenServicePort 5049
 HiddenServicePort 5050
+HiddenServiceNumIntroductionPoints 5

+ClientUseIPv6 1
+ClientUseIPv4 1
 VirtualAddrNetworkIPv4 10.192.0.0/10
 VirtualAddrNetworkIPv6 [FC00::]/7
 AutomapHostsOnResolve 1
 TransPort 9040
 TransPort [::1]:9040
-DNSPort 53
-DNSPort [::1]:53
+DNSPort 54
+DNSPort [::1]:54
 MaxClientCircuitsPending 1024
-NumCPUs 2
 HardwareAccel 1
 AvoidDiskWrites 1
+NumEntryGuards 6