Merge pull request #27 from Enkidu-6/dev

Dev
Enkidu-6 · Dec 4, 2022 · 39154c3 · 39154c3
2 parents 0e403d7 + 447cb2f
commit 39154c3
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 26 deletions.
diff --git a/combined.sh b/combined.sh
@@ -12,7 +12,7 @@ modprobe xt_recent ip_list_tot=10000
 ORPort=443
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
@@ -26,7 +26,7 @@ iptables -t mangle -A PREROUTING -p tcp --syn --destination-port $ORPort -m conn
 iptables -t mangle -A PREROUTING -p tcp --destination-port $ORPort -j ACCEPT
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/cron/refresh-authorities.sh b/cron/refresh-authorities.sh
@@ -3,13 +3,13 @@
 ipset flush allow-list
 ipset flush allow-list6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 /usr/sbin/ipset add -exist allow-list $i
 done;
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 /usr/sbin/ipset add -exist allow-list6 $i

diff --git a/dual-or/2or-v4.sh b/dual-or/2or-v4.sh
@@ -11,7 +11,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i

diff --git a/dual-or/2or-v6.sh b/dual-or/2or-v6.sh
@@ -8,7 +8,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/dual-or/combined-2or.sh b/dual-or/combined-2or.sh
@@ -14,7 +14,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
@@ -34,7 +34,7 @@ iptables -t mangle -A PREROUTING -p tcp --destination-port $ORPort -j ACCEPT
 iptables -t mangle -A PREROUTING -p tcp --destination-port $ORPort2 -j ACCEPT
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/host/2or-v4-host.sh b/host/2or-v4-host.sh
@@ -12,7 +12,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i

diff --git a/host/2or-v6-host.sh b/host/2or-v6-host.sh
@@ -9,7 +9,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/host/combined-2or-host.sh b/host/combined-2or-host.sh
@@ -18,7 +18,7 @@ ORPort=443
 ORPort2=80
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
@@ -38,7 +38,7 @@ iptables -t mangle -A PREROUTING -p tcp --destination $ipaddress --destination-p
 iptables -t mangle -A PREROUTING -p tcp --destination $ipaddress --destination-port $ORPort2 -j ACCEPT
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/host/combined-host.sh b/host/combined-host.sh
@@ -16,7 +16,7 @@ ip6address=xxxx:xxxx::xxxx
 ORPort=443
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
@@ -30,7 +30,7 @@ iptables -t mangle -A PREROUTING -p tcp --syn --destination $ipaddress --destina
 iptables -t mangle -A PREROUTING -p tcp --destination $ipaddress --destination-port $ORPort -j ACCEPT
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/host/ip6tables-host.sh b/host/ip6tables-host.sh
@@ -7,7 +7,7 @@ ip6address=xxxx:xxxx::xxxx
 ORPort=443
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/host/iptables-host.sh b/host/iptables-host.sh
@@ -10,7 +10,7 @@ ipaddress=10.1.1.2
 ORPort=443
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i

diff --git a/ip6tables.sh b/ip6tables.sh
@@ -6,7 +6,7 @@ ip6tables -t mangle -F
 ORPort=443
 ipset create -exist allow-list6 hash:ip family inet6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/iptables.sh b/iptables.sh
@@ -9,7 +9,7 @@ modprobe xt_recent ip_list_tot=10000
 ORPort=443
 ipset create -exist allow-list hash:ip
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i

diff --git a/update/update-2or-host.sh b/update/update-2or-host.sh
@@ -15,13 +15,13 @@ sleep 2
 ipset flush allow-list
 ipset flush allow-list6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
 done;
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/update/update-2or.sh b/update/update-2or.sh
@@ -15,13 +15,13 @@ sleep 2
 ipset flush allow-list
 ipset flush allow-list6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
 done;
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/update/update-host.sh b/update/update-host.sh
@@ -15,13 +15,13 @@ sleep 2
 ipset flush allow-list
 ipset flush allow-list6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
 done;
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i

diff --git a/update/update.sh b/update/update.sh
@@ -15,13 +15,13 @@ sleep 2
 ipset flush allow-list
 ipset flush allow-list6
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v4.txt' | sed -e '1,3d' > /var/tmp/allow
-getent ahostsv4 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake.txt' | sed -e '1,3d' >> /var/tmp/allow
 for i in `cat /var/tmp/allow` ;
 do
 ipset add -exist allow-list $i
 done;
 curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/authorities-v6.txt' | sed -e '1,3d' > /var/tmp/allow6
-getent ahostsv6 snowflake-01.torproject.net | awk '{ print $1 }' | sort -u >> /var/tmp/allow6
+curl -s 'https://raw.githubusercontent.com/Enkidu-6/tor-relay-lists/main/snowflake-v6.txt' | sed -e '1,3d' >> /var/tmp/allow6
 for i in `cat /var/tmp/allow6` ;
 do
 ipset add -exist allow-list6 $i