Refact some scrips

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

scripts/2021/tor1wcli@.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=tor1wcli
-
-[Service]
-ExecStart=/usr/local/bin/tor1wcli %i
-WorkingDirectory=/root/tor1wcli/

scripts/2021/tor1wserv.service

@@ -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/

scripts/2021/tor2wcli@.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=tor2wcli
-
-[Service]
-ExecStart=/usr/local/bin/tor2wcli %i
-WorkingDirectory=/root/tor2wcli/

scripts/2021/torexit

@@ -17,7 +17,7 @@ sleep 5
   -c 135000 \
   -i 40 \
   -s 172 \
-  -m tor2w
+  -m torexit
 
 kill $!
 done

scripts/2021/torexit@.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=torexit
+
+[Service]
+ExecStart=/usr/local/bin/torexit %i
+WorkingDirectory=/root/torexit/

scripts/2021/torexithelper.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=tor2wserv
+Description=torexit
 
 [Service]
 ExecStart=/usr/local/bin/torecho -s 172 -p 443

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

scripts/2021/torexitna@.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=torexitna
+
+[Service]
+ExecStart=/usr/local/bin/torexitna %i
+WorkingDirectory=/root/torexitna/

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/