From 65190b2e717665d09c80b8abe7c6f565d4394b26 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 1 Feb 2021 21:14:02 +0100
Subject: [PATCH] Refact some scrips

---
 scripts/2021/install.sh                                   | 7 ++++---
 scripts/2021/tor1wcli@.service                            | 6 ------
 scripts/2021/tor1wserv.service                            | 6 ------
 scripts/2021/tor2wcli@.service                            | 6 ------
 scripts/2021/{tor2wcli => torexit}                        | 2 +-
 scripts/2021/torexit@.service                             | 6 ++++++
 scripts/2021/{tor2wserv.service => torexithelper.service} | 2 +-
 scripts/2021/{tor1wcli => torexitna}                      | 4 ++--
 scripts/2021/torexitna@.service                           | 6 ++++++
 scripts/2021/torexitnahelper.service                      | 6 ++++++
 10 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 scripts/2021/tor1wcli@.service
 delete mode 100644 scripts/2021/tor1wserv.service
 delete mode 100644 scripts/2021/tor2wcli@.service
 rename scripts/2021/{tor2wcli => torexit} (96%)
 create mode 100644 scripts/2021/torexit@.service
 rename scripts/2021/{tor2wserv.service => torexithelper.service} (75%)
 rename scripts/2021/{tor1wcli => torexitna} (87%)
 create mode 100644 scripts/2021/torexitna@.service
 create mode 100644 scripts/2021/torexitnahelper.service

diff --git a/scripts/2021/install.sh b/scripts/2021/install.sh
index 38ed9f0..e3d541f 100755
--- a/scripts/2021/install.sh
+++ b/scripts/2021/install.sh
@@ -10,7 +10,7 @@ for scr in donaralt donaraltna donaraltopt \
            donardup donardupna donardupopt \
            torfone torfonena torfoneopt \
            torhs torhsna torhsopt \
-           tor1wcli tor2wcli; do
+           torexitna torexit; do
   wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/${scr}?inline=false -O ${scr}
   chmod +x ${scr}
 done
@@ -20,7 +20,8 @@ for svc in donaraltna@.service donaraltopt@.service donaralt@.service \
            donardupna@.service donardupopt@.service donardup@.service \
            torfonena@.service torfoneopt@.service torfone@.service \
            torhsna@.service torhsopt@.service torhs@.service \
-           tor1wcli@.service tor1wserv.service tor2wcli@.service tor2wserv.service; do
+           torexitna@.service torexitnahelper.service \
+           torexit@.service torexithelper.service; do
   wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/${svc}?inline=false -O ${svc}
 done
 
@@ -29,6 +30,6 @@ for out in donaralt donaraltna donaraltopt \
            donardup donardupna donardupopt \
            torfone torfonena torfoneopt \
            torhs torhsna torhsopt \
-           tor1w tor2w; do
+           torexitna torexit; do
   mkdir ${out}
 done
diff --git a/scripts/2021/tor1wcli@.service b/scripts/2021/tor1wcli@.service
deleted file mode 100644
index 11ed9a4..0000000
--- a/scripts/2021/tor1wcli@.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=tor1wcli
-
-[Service]
-ExecStart=/usr/local/bin/tor1wcli %i
-WorkingDirectory=/root/tor1wcli/
diff --git a/scripts/2021/tor1wserv.service b/scripts/2021/tor1wserv.service
deleted file mode 100644
index 27fccb3..0000000
--- a/scripts/2021/tor1wserv.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=tor1wserv
-
-[Service]
-ExecStart=/usr/local/bin/measlat -l -t tcp -p 443 -c 135000 -i 40 -s 172 -m tor1w
-WorkingDirectory=/root/tor1wserv/
diff --git a/scripts/2021/tor2wcli@.service b/scripts/2021/tor2wcli@.service
deleted file mode 100644
index 93e758b..0000000
--- a/scripts/2021/tor2wcli@.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=tor2wcli
-
-[Service]
-ExecStart=/usr/local/bin/tor2wcli %i
-WorkingDirectory=/root/tor2wcli/
diff --git a/scripts/2021/tor2wcli b/scripts/2021/torexit
similarity index 96%
rename from scripts/2021/tor2wcli
rename to scripts/2021/torexit
index 2b39e5c..4d518fe 100755
--- a/scripts/2021/tor2wcli
+++ b/scripts/2021/torexit
@@ -17,7 +17,7 @@ sleep 5
   -c 135000 \
   -i 40 \
   -s 172 \
-  -m tor2w
+  -m torexit
 
 kill $!
 done
diff --git a/scripts/2021/torexit@.service b/scripts/2021/torexit@.service
new file mode 100644
index 0000000..6930bd6
--- /dev/null
+++ b/scripts/2021/torexit@.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=torexit
+
+[Service]
+ExecStart=/usr/local/bin/torexit %i
+WorkingDirectory=/root/torexit/
diff --git a/scripts/2021/tor2wserv.service b/scripts/2021/torexithelper.service
similarity index 75%
rename from scripts/2021/tor2wserv.service
rename to scripts/2021/torexithelper.service
index 8a1647f..deef29d 100644
--- a/scripts/2021/tor2wserv.service
+++ b/scripts/2021/torexithelper.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=tor2wserv
+Description=torexit
 
 [Service]
 ExecStart=/usr/local/bin/torecho -s 172 -p 443
diff --git a/scripts/2021/tor1wcli b/scripts/2021/torexitna
similarity index 87%
rename from scripts/2021/tor1wcli
rename to scripts/2021/torexitna
index d02d539..a2ded44 100755
--- a/scripts/2021/tor1wcli
+++ b/scripts/2021/torexitna
@@ -12,12 +12,12 @@ sleep 5
 /usr/local/bin/measlat \
   -t tor \
   -q $SOCK_PORT \
-  -h rayonx.machine.deuxfleurs.fr \
+  -h $(curl ifconfig.me) \
   -p 443 \
   -c 135000 \
   -i 40 \
   -s 172 \
-  -m tor1w
+  -m torexitna
 
 kill $!
 done
diff --git a/scripts/2021/torexitna@.service b/scripts/2021/torexitna@.service
new file mode 100644
index 0000000..e96ea59
--- /dev/null
+++ b/scripts/2021/torexitna@.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=torexitna
+
+[Service]
+ExecStart=/usr/local/bin/torexitna %i
+WorkingDirectory=/root/torexitna/
diff --git a/scripts/2021/torexitnahelper.service b/scripts/2021/torexitnahelper.service
new file mode 100644
index 0000000..92971e0
--- /dev/null
+++ b/scripts/2021/torexitnahelper.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=torexitnahelper
+
+[Service]
+ExecStart=/usr/local/bin/measlat -l -t tcp -p 443 -c 135000 -i 40 -s 172 -m torexitnat
+WorkingDirectory=/root/torexitna/