From 119a41a5d5add2a8883593c6a7b08c53a110ed2d Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 28 Jan 2021 12:00:47 +0100
Subject: [PATCH] Finalize deployment

---
 scripts/2021/donaraltna@.service |  7 +++
 scripts/2021/donardupna@.service |  7 +++
 scripts/2021/install.sh          | 19 ++++++--
 scripts/2021/main.tf             | 80 ++++++++++++++++++++++++++++++++
 scripts/2021/torfonena@.service  |  7 +++
 5 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 scripts/2021/donaraltna@.service
 create mode 100644 scripts/2021/donardupna@.service
 create mode 100644 scripts/2021/torfonena@.service

diff --git a/scripts/2021/donaraltna@.service b/scripts/2021/donaraltna@.service
new file mode 100644
index 0000000..b92d320
--- /dev/null
+++ b/scripts/2021/donaraltna@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=donaraltna
+
+[Service]
+ExecStart=/usr/local/bin/donaraltna %i
+WorkingDirectory=/root/donaraltna/
+
diff --git a/scripts/2021/donardupna@.service b/scripts/2021/donardupna@.service
new file mode 100644
index 0000000..af1b453
--- /dev/null
+++ b/scripts/2021/donardupna@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=donardupna
+
+[Service]
+ExecStart=/usr/local/bin/donardupna %i
+WorkingDirectory=/root/donardupna/
+
diff --git a/scripts/2021/install.sh b/scripts/2021/install.sh
index ee3f7c8..38ed9f0 100755
--- a/scripts/2021/install.sh
+++ b/scripts/2021/install.sh
@@ -1,23 +1,34 @@
 #!/bin/bash
 
 cd /usr/local/bin/
-
 for bin in donar measlat tor2 tor3 torecho udpecho; do
   wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/dist/${bin}?inline=false -O ${bin}
   chmod +x ${bin}
 done
 
-for scr in donaralt donaraltna donaraltopt donardup donardupna donardupopt tor1wcli tor2wcli torfone torfonena torfoneopt torhs torhsna torhsopt; do
+for scr in donaralt donaraltna donaraltopt \
+           donardup donardupna donardupopt \
+           torfone torfonena torfoneopt \
+           torhs torhsna torhsopt \
+           tor1wcli tor2wcli; do
   wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/${scr}?inline=false -O ${scr}
   chmod +x ${scr}
 done
 
 cd /etc/systemd/system/
-for svc in donaraltopt@.service donaralt@.service donardupopt@.service donardup@.service tor1wcli@.service tor1wserv.service tor2wcli@.service tor2wserv.service torfoneopt@.service torfone@.service torhsna@.service torhsopt@.service torhs@.service; do
+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
   wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/${svc}?inline=false -O ${svc}
 done
 
 cd /root
-for out in donaralt donaraltna donaraltopt donardup donardupna donardupopt tor1w tor2w torfone torfonena torfoneopt torhs torhsna torhsopt; do
+for out in donaralt donaraltna donaraltopt \
+           donardup donardupna donardupopt \
+           torfone torfonena torfoneopt \
+           torhs torhsna torhsopt \
+           tor1w tor2w; do
   mkdir ${out}
 done
diff --git a/scripts/2021/main.tf b/scripts/2021/main.tf
index bb87c3e..13adc36 100644
--- a/scripts/2021/main.tf
+++ b/scripts/2021/main.tf
@@ -93,3 +93,83 @@ EOT
   ip_id = scaleway_instance_ip.torfonena_ip.id
 }
 
+/**********************
+ * DONAR ALT
+ **********************/
+resource "scaleway_instance_ip" "donaralt_ip" {}
+resource "scaleway_instance_server" "donaralt" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donaralt"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donaralt@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donaralt_ip.id
+}
+resource "scaleway_instance_ip" "donaraltopt_ip" {}
+resource "scaleway_instance_server" "donaraltopt" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donaraltopt"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donaraltopt@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donataltopt_ip.id
+}
+resource "scaleway_instance_ip" "donaraltna_ip" {}
+resource "scaleway_instance_server" "donaraltna" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donaraltna"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donaraltna@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donaraltna_ip.id
+}
+
+
+/**********************
+ * DONAR DUP
+ **********************/
+resource "scaleway_instance_ip" "donardup_ip" {}
+resource "scaleway_instance_server" "donardup" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donardup"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donardup@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donardup_ip.id
+}
+resource "scaleway_instance_ip" "donardupopt_ip" {}
+resource "scaleway_instance_server" "donardupopt" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donardupopt"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donardupopt@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donatdupopt_ip.id
+}
+resource "scaleway_instance_ip" "donardupna_ip" {}
+resource "scaleway_instance_server" "donardupna" {
+  type  = "DEV1-L"
+  image = "ubuntu_focal"
+  name = "donardupna"
+  cloud_init = <<-EOT
+#!/bin/bash
+wget https://gitlab.inria.fr/qdufour/donar/-/raw/master/scripts/2021/install.sh?inline=false -O - | bash
+for i in $(seq 1 8); do echo start $i ; systemctl start donardupna@$i ; sleep 60 ; done
+EOT
+  ip_id = scaleway_instance_ip.donardupna_ip.id
+}
diff --git a/scripts/2021/torfonena@.service b/scripts/2021/torfonena@.service
new file mode 100644
index 0000000..5d05e6e
--- /dev/null
+++ b/scripts/2021/torfonena@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=torfonena
+
+[Service]
+ExecStart=/usr/local/bin/torfonena %i
+WorkingDirectory=/root/torfonena/
+