From a924381e9ea41f462d9b62d4b9d9efe0f16e7ba9 Mon Sep 17 00:00:00 2001
From: David Myers <dem@myersnet.net>
Date: Thu, 23 Dec 2021 13:25:36 -0500
Subject: [PATCH] Fix Vultr (#14389)

---
 files/cloud-init/base.sh         | 2 ++
 files/cloud-init/base.yml        | 1 +
 roles/cloud-vultr/tasks/main.yml | 4 +---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/files/cloud-init/base.sh b/files/cloud-init/base.sh
index 9c84e95..753441d 100644
--- a/files/cloud-init/base.sh
+++ b/files/cloud-init/base.sh
@@ -19,6 +19,8 @@ EOF
 test -d /home/algo/.ssh || sudo -u algo mkdir -m 0700 /home/algo/.ssh
 echo "{{ lookup('file', '{{ SSH_keys.public }}') }}" | (sudo -u algo tee /home/algo/.ssh/authorized_keys && chmod 0600 /home/algo/.ssh/authorized_keys)
 
+ufw --force reset
+
 # shellcheck disable=SC2015
 dpkg -l sshguard && until apt-get remove -y --purge sshguard; do
   sleep 3
diff --git a/files/cloud-init/base.yml b/files/cloud-init/base.yml
index 5cc03fd..8a14b5f 100644
--- a/files/cloud-init/base.yml
+++ b/files/cloud-init/base.yml
@@ -25,5 +25,6 @@ write_files:
 
 runcmd:
   - set -x
+  - ufw --force reset
   - sudo apt-get remove -y --purge sshguard || true
   - systemctl restart sshd.service
diff --git a/roles/cloud-vultr/tasks/main.yml b/roles/cloud-vultr/tasks/main.yml
index ff34709..6ad1d7b 100644
--- a/roles/cloud-vultr/tasks/main.yml
+++ b/roles/cloud-vultr/tasks/main.yml
@@ -28,9 +28,7 @@
     vultr_startup_script:
       name: algo-startup
       script:  |
-        {{ lookup('template', 'files/cloud-init/base.sh') }}
-        mkdir -p /var/lib/cloud/data/ || true
-        touch /var/lib/cloud/data/result.json
+        {{ lookup('template', 'files/cloud-init/base.yml') }}
 
   - name: Creating a server
     vultr_server: