tasks queue

conn.env

@@ -0,0 +1 @@
+SSHCONN=root@bogaledev.ru

data/action.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -euo pipefail
+if [ ! -e state ]; then
+    echo 0 > state
+fi
+case "$(cat state)" in
+  0)
+    ./data/setup.sh
+    ;;
+  1)
+    ./data/install.sh
+    ;;
+  2)
+    echo Installed in $(($(date +%s)-$(cat start)))s
+    rm -r *
+    exit
+esac
+echo "$((1+$(cat state)))" > state
+reboot
+exit 1

data/install.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/bash
 set -euo pipefail
-. data/vps.env
+. data/dest.env
-export DEBIAN_FRONTEND=noninteractive
-apt-get install -y software-properties-common python3-launchpadlib gnupg2 linux-headers-$(uname -r)
-add-apt-repository -y ppa:amnezia/ppa
-apt-get install -y amneziawg amneziawg-tools iptables-persistent
 cat <<EOF >> /etc/sysctl.conf
 net.ipv4.ip_forward = 1
 net.ipv4.conf.all.forwarding = 1
@@ -24,12 +20,10 @@ for route in tcp:25 tcp:80 tcp:443 udp:443; do
     ip6tables -t nat -A PREROUTING -m addrtype --dst-type LOCAL -p $PROTO --dport $PORT -j DNAT --to-destination [$DEST6]:$PORT
     ip6tables -A FORWARD -d $DEST6 -p $PROTO --dport $PORT -j ACCEPT
 done
-netfilter-persistent save
+export DEBIAN_FRONTEND=noninteractive
+add-apt-repository -y ppa:amnezia/ppa
+apt-get install -y software-properties-common python3-launchpadlib gnupg2 linux-headers-$(uname -r) amneziawg amneziawg-tools iptables-persistent
 mv data/awg0.conf /etc/amnezia/amneziawg
 systemctl enable awg-quick@awg0
 apt-get autoremove --purge -y
 apt-get clean
-echo Installed in $(($(date +%s)-$(cat start)))s
-rm -r *
-reboot
-exit

data/setup.sh

@@ -11,5 +11,3 @@ echo "/var/swapfile none swap defaults 0 0" >> /etc/fstab
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold"
-reboot
-exit

host.env

@@ -1 +0,0 @@
-SERVER=bogaledev.ru

pack.sh

@@ -1,12 +1,9 @@
 #!/usr/bin/bash
 set -euo pipefail
-. host.env
+. conn.env
-ssh-wait() {
+ssh $SSHCONN "date +%s > start"
-    until ssh "root@$SERVER" "$1" || [ $? -eq 1 ]; do sleep 1; done
-}
-ssh-wait "date +%s > start"
 tar -czf data.tar.gz data
-scp data.tar.gz "root@$SERVER:"
+scp data.tar.gz $SSHCONN:
 rm data.tar.gz
-ssh-wait "tar --no-same-owner -xf data.tar.gz; ./data/setup.sh"
+ssh $SSHCONN "tar --no-same-owner -xf data.tar.gz"
-ssh-wait "./data/install.sh"
+until ssh $SSHCONN ./data/action.sh; do sleep 1; done