use hostnames for droplet names

this is how you convince digitalocean to set up proper reverse dns

4 files changed, 16 insertions, 5 deletions

diff --git a/bin/helpers/launch-algo b/bin/helpers/launch-algo
index 748d00e..fc84da0 100755
--- a/bin/helpers/launch-algo
+++ b/bin/helpers/launch-algo
@@ -41,7 +41,7 @@ echo "Running Ansible..."
 do_token=$(cat /mnt/digitalocean)
 ansible-playbook main.yml -e "
     provider=digitalocean
-    server_name=algo
+    server_name=algo.tozt.net
     region=nyc3
     do_token=$do_token
     dns_adblocking=false
diff --git a/bin/helpers/launch-mail b/bin/helpers/launch-mail
index bdc541e..a3e748e 100755
--- a/bin/helpers/launch-mail
+++ b/bin/helpers/launch-mail
@@ -5,7 +5,7 @@ set -o pipefail
 # shellcheck source=functions.sh
 . "$(dirname "$0")/functions.sh"
 
-create_droplet mail s-1vcpu-2gb 5e4d8c7b-f840-11e8-b59e-0a58ac1467fb
+create_droplet mail.tozt.net s-1vcpu-2gb 5e4d8c7b-f840-11e8-b59e-0a58ac1467fb
 
 echo "Creating DNS entry for $ip..."
 record_id=$(doctl \
diff --git a/bin/helpers/launch-tozt b/bin/helpers/launch-tozt
index 4bef6f1..4777472 100755
--- a/bin/helpers/launch-tozt
+++ b/bin/helpers/launch-tozt
@@ -5,7 +5,7 @@ set -o pipefail
 # shellcheck source=functions.sh
 . "$(dirname "$0")/functions.sh"
 
-create_droplet tozt s-1vcpu-2gb 4206344e-cf4f-11e8-a5a7-0a58ac1465db
+create_droplet tozt.net s-1vcpu-2gb 4206344e-cf4f-11e8-a5a7-0a58ac1465db
 
 echo "Assigning floating ip to tozt..."
 # XXX this returns an error for some reason, but actually succeeds:
diff --git a/bin/terminate b/bin/terminate
index 2b100c1..01e1e3c 100755
--- a/bin/terminate
+++ b/bin/terminate
@@ -6,10 +6,21 @@ script_path="$(realpath "$(dirname "$0")")"
 secrets_bin="${script_path}/secrets"
 
 case "$1" in
-    base|tozt|algo|mail|partofme)
+    tozt|algo|mail)
         "$secrets_bin" open
         trap '"$secrets_bin" close' EXIT
-        doctl -t "$(cat /mnt/digitalocean)" compute droplet delete "$1"
+        case "$1" in
+            tozt)
+                hostname=tozt.net
+            ;;
+            algo)
+                hostname=algo.tozt.net
+            ;;
+            mail)
+                hostname=mail.tozt.net
+            ;;
+        esac
+        doctl -t "$(cat /mnt/digitalocean)" compute droplet delete "$hostname"
         ;;
     *)
         echo "unknown host $1" >&2