fix tor and refactor

4B4DB4B3 · Oct 12, 2020 · c718d9e · c718d9e
1 parent 9da7951
commit c718d9e
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/torctl b/torctl
@@ -15,7 +15,7 @@
 ################################################################################
 
 # torctl.sh version
-VERSION="torctl.sh v0.5.5"
+VERSION="torctl.sh v0.5.6"
 
 # exclude locals
 TOR_EXCLUDE="192.168.0.0/16 172.16.0.0/12 10.0.0.0/8"
@@ -152,7 +152,7 @@ wipe() {
 }
 
 get_ip() {
-    RADDR=$(wget -qO- http://ipecho.net/plain)
+    RADDR=$(curl -s https://ipinfo.io/ip)
     msg "remote ip: $RADDR"
 }
 
@@ -236,6 +236,7 @@ gen_torrc() {
     warn "configuring tor"
     cat >"${TORRC}" <<EOF
 # generated by torctl
+User $TOR_UID
 DataDirectory /var/lib/tor
 VirtualAddrNetwork 10.192.0.0/10
 AutomapHostsOnResolve 1
@@ -245,6 +246,7 @@ SocksPort 127.0.0.1:9050 IsolateClientAddr IsolateSOCKSAuth IsolateClientProtoco
 ControlPort 9051
 HashedControlPassword 16:FDE8ED505C45C8BA602385E2CA5B3250ED00AC0920FEC1230813A1F86F
 DNSPort 127.0.0.1:$TOR_DNS
+Sandbox 1
 HardwareAccel 1
 TestSocks 1
 AllowNonRFC953Hostnames 0
@@ -297,14 +299,6 @@ apply_iptables_rules() {
 apply_sysctl_rules() {
     info "applying sysctl rules"
 
-    # Swappiness
-    sysctl -w vm.dirty_ratio=10 &>"/dev/null"
-    sysctl -w vm.dirty_background_ratio=5 &>"/dev/null"
-    sysctl -w vm.dirty_expire_centisecs=2000 &>"/dev/null"
-    sysctl -w vm.dirty_writeback_centisecs=1000 &>"/dev/null"
-    sysctl -w vm.swappiness=10 &>"/dev/null"
-    sysctl -w vm.vfs_cache_pressure=70 &>"/dev/null"
-
     # Disable Explicit Congestion Notification in TCP
     sysctl -w net.ipv4.tcp_ecn=0 &>"/dev/null"
 
@@ -448,8 +442,7 @@ start() {
     # generate new resolv.conf
     gen_resolv_conf
 
-    # start needed services
-    start_service iptables
+    # start tor service
     start_service tor
 
     # apply new iptables rules