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/README.md
+++ b/README.md
@ -23,7 +23,7 @@ To get the latest tor version, you should follow these instructions to add the o

 The following command will install all required packages:
 ```
-apt-get --no-install-recommends install apt-transport-tor aspell curl dovecot-imapd dovecot-pop3d git haveged hunspell iptables locales-all logrotate mariadb-server nginx-light postfix postfix-mysql php7.0-bcmath php7.0-bz2 php7.0-curl php7.0-dba php7.0-enchant php7.0-fpm php7.0-gd php7.0-gmp php7.0-imap php7.0-intl php7.0-json php7.0-mbstring php7.0-mcrypt php7.0-mysql php7.0-opcache php7.0-pspell php7.0-readline php7.0-recode php7.0-soap php7.0-sqlite3 php7.0-tidy php7.0-xml php7.0-xmlrpc php7.0-xsl php7.0-zip php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-curl php7.1-dba php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-intl php7.1-json php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-opcache php7.1-pspell php7.1-readline php7.1-recode php7.1-soap php7.1-sqlite3 php7.1-tidy php7.1-xml php7.1-xmlrpc php7.1-xsl php7.1-zip php7.2-bcmath php7.2-bz2 php7.2-cli php7.2-curl php7.2-dba php7.2-enchant php7.2-fpm php7.2-gd php7.2-gmp php7.2-imap php7.2-intl php7.2-json php7.2-mbstring php7.2-mysql php7.2-opcache php7.2-pspell php7.2-readline php7.2-recode php7.2-soap php7.2-sqlite3 php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip phpmyadmin php-imagick sasl2-bin ssh subversion tor vsftpd && apt-get --no-install-recommends install adminer
+apt-get --no-install-recommends install apt-transport-tor aspell curl dovecot-imapd dovecot-pop3d git dnsmasq haveged hunspell iptables locales-all logrotate mariadb-server nginx-light postfix postfix-mysql php7.0-bcmath php7.0-bz2 php7.0-curl php7.0-dba php7.0-enchant php7.0-fpm php7.0-gd php7.0-gmp php7.0-imap php7.0-intl php7.0-json php7.0-mbstring php7.0-mcrypt php7.0-mysql php7.0-opcache php7.0-pspell php7.0-readline php7.0-recode php7.0-soap php7.0-sqlite3 php7.0-tidy php7.0-xml php7.0-xmlrpc php7.0-xsl php7.0-zip php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-curl php7.1-dba php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-intl php7.1-json php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-opcache php7.1-pspell php7.1-readline php7.1-recode php7.1-soap php7.1-sqlite3 php7.1-tidy php7.1-xml php7.1-xmlrpc php7.1-xsl php7.1-zip php7.2-bcmath php7.2-bz2 php7.2-cli php7.2-curl php7.2-dba php7.2-enchant php7.2-fpm php7.2-gd php7.2-gmp php7.2-imap php7.2-intl php7.2-json php7.2-mbstring php7.2-mysql php7.2-opcache php7.2-pspell php7.2-readline php7.2-recode php7.2-soap php7.2-sqlite3 php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip phpmyadmin php-imagick sasl2-bin ssh subversion tor vsftpd && apt-get --no-install-recommends install adminer
 ```

 For optimum spell checking capabilities you can optionally install the following packages:
--- 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