summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xansible/all.sh19
-rw-r--r--ansible/authorized_keys/_ickwm0
-rw-r--r--ansible/authorized_keys/backups1
-rw-r--r--ansible/authorized_keys/distix1
-rw-r--r--ansible/authorized_keys/ickliwfi2
-rw-r--r--ansible/authorized_keys/liw1
-rw-r--r--ansible/authorized_keys/obbench3
-rw-r--r--ansible/authorized_keys/sshforward2
-rw-r--r--ansible/authorized_keys/yakking1
-rw-r--r--ansible/git.liw.fi.hz5
-rw-r--r--ansible/git.liw.fi.yml2
-rw-r--r--ansible/hosts54
-rw-r--r--ansible/hosts.ci-prep0
-rw-r--r--ansible/hosts.ci-prod1
-rw-r--r--ansible/hosts.ci-prod-workers0
-rw-r--r--ansible/hosts.collectd0
-rw-r--r--ansible/hosts.demo0
-rw-r--r--ansible/hosts.demo-workers0
-rw-r--r--ansible/hosts.docstory-files0
-rw-r--r--ansible/hosts.git1
-rw-r--r--ansible/hosts.http1
-rw-r--r--ansible/hosts.irc1
-rw-r--r--ansible/hosts.letest0
-rw-r--r--ansible/hosts.mirror0
-rw-r--r--ansible/hosts.obnam0
-rw-r--r--ansible/hosts.shell1
-rw-r--r--ansible/hosts.subplot-dan0
-rw-r--r--ansible/http.liw.fi.hz5
-rw-r--r--ansible/http.liw.fi.yml2
-rw-r--r--ansible/irc.liw.fi.hz5
-rw-r--r--ansible/irc.liw.fi.yml2
-rw-r--r--ansible/letest-letest.vm.liw.fi.hz5
-rw-r--r--ansible/maybe-someday/apt-dev.yml (renamed from ansible/apt-dev.yml)0
-rw-r--r--ansible/maybe-someday/billion.yml (renamed from ansible/billion.yml)0
-rw-r--r--ansible/maybe-someday/clab-dev.yml (renamed from ansible/clab-dev.yml)0
-rw-r--r--ansible/maybe-someday/contractor-dev.yml (renamed from ansible/contractor-dev.yml)0
-rw-r--r--ansible/maybe-someday/debian-mirror.yml (renamed from ansible/debian-mirror.yml)0
-rw-r--r--ansible/maybe-someday/debmirror.yml (renamed from ansible/debmirror.yml)0
-rw-r--r--ansible/maybe-someday/ewww-dev.yml (renamed from ansible/ewww-dev.yml)0
-rw-r--r--ansible/maybe-someday/ewww-test.yml (renamed from ansible/ewww-test.yml)0
-rw-r--r--ansible/maybe-someday/ick2-dev.yml (renamed from ansible/ick2-dev.yml)0
-rw-r--r--ansible/maybe-someday/jt-dev.yml (renamed from ansible/jt-dev.yml)0
-rw-r--r--ansible/maybe-someday/letest-letest.vm.liw.fi.yml (renamed from ansible/letest-letest.vm.liw.fi.yml)0
-rw-r--r--ansible/maybe-someday/openpgp-ca-dev.yml (renamed from ansible/openpgp-ca-dev.yml)0
-rw-r--r--ansible/maybe-someday/openpgp-card-dev.yml (renamed from ansible/openpgp-card-dev.yml)0
-rw-r--r--ansible/maybe-someday/python-mess.yml (renamed from ansible/python-mess.yml)0
-rw-r--r--ansible/maybe-someday/roadmap-dev.yml (renamed from ansible/roadmap-dev.yml)0
-rw-r--r--ansible/maybe-someday/rust-dev.yml (renamed from ansible/rust-dev.yml)0
-rw-r--r--ansible/maybe-someday/sq-test.yml (renamed from ansible/sq-test.yml)0
-rw-r--r--ansible/maybe-someday/ssh-dev.yml (renamed from ansible/ssh-dev.yml)0
-rw-r--r--ansible/shell-shell.vm.liw.fi.hz5
-rw-r--r--ansible/shell-shell.vm.liw.fi.yml2
-rw-r--r--ansible/subplot-dan.hz5
-rw-r--r--vmadm/someday-maybe/openpgp-ca-dev.yaml (renamed from vmadm/stamina/openpgp-ca-dev.yaml)0
-rw-r--r--vmadm/someday-maybe/openpgp-card-dev.yaml (renamed from vmadm/stamina/openpgp-card-dev.yaml)0
-rw-r--r--vmadm/stamina/solokeys-website.yaml4
56 files changed, 28 insertions, 103 deletions
diff --git a/ansible/all.sh b/ansible/all.sh
index f2b9010..41f650f 100755
--- a/ansible/all.sh
+++ b/ansible/all.sh
@@ -20,16 +20,6 @@ maybe_run_playbook() {
fi
}
-maybe_run_ansible() {
- if newer "$1.yml" "$1.stamp" && online "$1"; then
- echo "$1"
- chronic run-ansible "$1.hz" "hosts.$2" "$1.yml"
- touch "$1.stamp"
- else
- echo "SKIPPING $1"
- fi
-}
-
maybe_run_playbook solace
maybe_run_playbook exolobe1
maybe_run_playbook exolobe2
@@ -38,8 +28,7 @@ maybe_run_playbook holywood2
maybe_run_playbook web
maybe_run_playbook atuin.liw.fi
maybe_run_playbook mirror-git
-
-maybe_run_ansible git.liw.fi git
-maybe_run_ansible http.liw.fi http
-maybe_run_ansible irc.liw.fi irc
-maybe_run_ansible shell-shell.vm.liw.fi shell
+maybe_run_playbook git.liw.fi
+maybe_run_playbook http.liw.fi
+maybe_run_playbook irc.liw.fi
+maybe_run_playbook shell-shell.vm.liw.fi
diff --git a/ansible/authorized_keys/_ickwm b/ansible/authorized_keys/_ickwm
deleted file mode 100644
index e69de29..0000000
--- a/ansible/authorized_keys/_ickwm
+++ /dev/null
diff --git a/ansible/authorized_keys/backups b/ansible/authorized_keys/backups
deleted file mode 100644
index 5b6719a..0000000
--- a/ansible/authorized_keys/backups
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
diff --git a/ansible/authorized_keys/distix b/ansible/authorized_keys/distix
deleted file mode 100644
index 5b6719a..0000000
--- a/ansible/authorized_keys/distix
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
diff --git a/ansible/authorized_keys/ickliwfi b/ansible/authorized_keys/ickliwfi
deleted file mode 100644
index d2fb365..0000000
--- a/ansible/authorized_keys/ickliwfi
+++ /dev/null
@@ -1,2 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWvVYqyPen0CFhfx9dzzCKNbQ7fUpbCRdlQ/PI4sAv5R+gjUYjZJ3HQQhdkEx6mwY+fGYgGIAY9xiTi+BzXSPPtuWUypB2/ee+Dh5Uqica1TCj/3txmFGE7qwD+AqoJYbDAD1x17AaCIEDgHv2wOQ2o8GlOKTK9mGgvZWTUgIUF7PObotg8/M6TV4NO3of7ZSJ0yqumU/GLaJ8UkvYVQ3Gj0w8tbX6xiJKcOnMyM+P+JIFRKKi/SzjymVfAie9OAlIcDEYTeT6dtqWYB6hT0/40D0ZcxOfIg07/m4A956hH9AzRKuz01w2phP2zQyHRUSOCWa5EWF/H9snxpeE5Ein liw@exolobe3
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
diff --git a/ansible/authorized_keys/liw b/ansible/authorized_keys/liw
deleted file mode 100644
index 5b6719a..0000000
--- a/ansible/authorized_keys/liw
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
diff --git a/ansible/authorized_keys/obbench b/ansible/authorized_keys/obbench
deleted file mode 100644
index 327e9e7..0000000
--- a/ansible/authorized_keys/obbench
+++ /dev/null
@@ -1,3 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4YSJQK7HFM7J9+mNpTzqu5TDnR0PlofNdi1oWz0VShpJkaNxS+REp0lYxlMiC3Ytp+/+xPsgxGgfHUwmYYFTsOccaKivjDpfqUg1RK4NeenpdXArX9ZctmBRciP58jndjVJ54UO9QL6smkx7LcbMFSI+FEhaCCxVBHaD7OMeEtjvCnhzFUAHYS/uUH5dTzoT63v6Oo4IYfTM8SlGYjtepcm9xy3gPXDcIxWxhxqT01lrzgUM9l4+DzHfrenJy9NSZSoYRzVqMPam3x/35K5O6HNJKN0uf80Aos/33bdxdqIAsKEQe0+xi7kEfwgMN5NSWAvBj9utzij7A+weuQOxb liw@obbench2
-
diff --git a/ansible/authorized_keys/sshforward b/ansible/authorized_keys/sshforward
deleted file mode 100644
index fc38b16..0000000
--- a/ansible/authorized_keys/sshforward
+++ /dev/null
@@ -1,2 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQ1CbVnqhFatB0aDrss1JE6arIDiYxAHl2iyVfrrtMF6Y7vMRWt2ETK8kNJrGzTuQZEGInk/PsnIdeaL0pz6cZrZnDf/Pqpmwit3idhvPHaLAtpc/XM/UOeC1lheawtDtKbmACguwnT0MtuIfy/ELQlaE+AOw1qBwsmwrc6pBTjB+5cPWbgGE+jNGvmi0QhaH3VkMduVX0xkHVxPkYoPMI3lSlalNp2RDwzkHiSua+RFE7GWDLGnZGYL0fRXNkR1mwroOSTdLdkckSU8P+L7v3TiQPpZJBBvzz70jP8hIs/8ty+AC5DNhz0SIewmYbBrJX3yaM+UvYr1TvWig0d/3R liw@exolobe1
diff --git a/ansible/authorized_keys/yakking b/ansible/authorized_keys/yakking
deleted file mode 100644
index 5b6719a..0000000
--- a/ansible/authorized_keys/yakking
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50
diff --git a/ansible/git.liw.fi.hz b/ansible/git.liw.fi.hz
deleted file mode 100644
index e10d6af..0000000
--- a/ansible/git.liw.fi.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cx11
- image: debian-10
-hosts:
- - name: git
diff --git a/ansible/git.liw.fi.yml b/ansible/git.liw.fi.yml
index 94721cb..ff246ed 100644
--- a/ansible/git.liw.fi.yml
+++ b/ansible/git.liw.fi.yml
@@ -1,4 +1,4 @@
-- hosts: git
+- hosts: git.liw.fi
remote_user: root
roles:
- role: sane_debian_system
diff --git a/ansible/hosts b/ansible/hosts
index adbee1a..18461d8 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -1,50 +1,36 @@
-[all]
-exolobe1
-exolobe2
-stamina
-x220
-kea
-qotom
-solace
-upliw0
-
-atuin ansible_ssh_host=atuin.liw.fi
-nalanda ansible_ssh_host=nalanda.liw.fi
-gregvm ansible_ssh_host=78.46.87.152
-
+[infra]
debian-mirror
holywood2
mirror-git
web
-pieni ansible_ssh_host=koom.pieni.net debian_codename=stretch
-sq-test ansible_ssh_host=sq-test.liw.fi
-
-apt-dev
-billion
-clab-dev
+[dev]
debian-ansible-dev
-ewww-dev
-ewww-test
-ick2-dev
icktool
-jt-dev
obnam-bench
obnam-dev
-openpgp-ca-dev
-openpgp-card-dev
-python-mess
riki-dev
-roadmap-dev
-rust-dev
-sequoia-dev
-sequoia-web
-solokeys-website
-ssh-dev
sshca-dev
subplot-dev
v-i-dev
vmadm-dev
vmdb2-dev
-toy
+[bare]
+exolobe1
+exolobe2
+stamina
+x220
+kea
+qotom
+solace
+upliw0
+
+[remote]
+atuin ansible_ssh_host=atuin.liw.fi
+nalanda ansible_ssh_host=nalanda.liw.fi
+gregvm ansible_ssh_host=78.46.87.152
+git.liw.fi
+http.liw.fi
+irc.liw.fi
+shell-shell.vm.liw.fi
diff --git a/ansible/hosts.ci-prep b/ansible/hosts.ci-prep
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.ci-prep
+++ /dev/null
diff --git a/ansible/hosts.ci-prod b/ansible/hosts.ci-prod
deleted file mode 100644
index c8c8c4b..0000000
--- a/ansible/hosts.ci-prod
+++ /dev/null
@@ -1 +0,0 @@
-controller ansible_ssh_host=ci-prod-controller.vm.liw.fi
diff --git a/ansible/hosts.ci-prod-workers b/ansible/hosts.ci-prod-workers
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.ci-prod-workers
+++ /dev/null
diff --git a/ansible/hosts.collectd b/ansible/hosts.collectd
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.collectd
+++ /dev/null
diff --git a/ansible/hosts.demo b/ansible/hosts.demo
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.demo
+++ /dev/null
diff --git a/ansible/hosts.demo-workers b/ansible/hosts.demo-workers
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.demo-workers
+++ /dev/null
diff --git a/ansible/hosts.docstory-files b/ansible/hosts.docstory-files
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.docstory-files
+++ /dev/null
diff --git a/ansible/hosts.git b/ansible/hosts.git
deleted file mode 100644
index 9477321..0000000
--- a/ansible/hosts.git
+++ /dev/null
@@ -1 +0,0 @@
-git ansible_ssh_host=git-git.vm.liw.fi
diff --git a/ansible/hosts.http b/ansible/hosts.http
deleted file mode 100644
index 564c4da..0000000
--- a/ansible/hosts.http
+++ /dev/null
@@ -1 +0,0 @@
-static ansible_ssh_host=http-static.vm.liw.fi
diff --git a/ansible/hosts.irc b/ansible/hosts.irc
deleted file mode 100644
index a94bb32..0000000
--- a/ansible/hosts.irc
+++ /dev/null
@@ -1 +0,0 @@
-irc ansible_ssh_host=irc-irc.vm.liw.fi
diff --git a/ansible/hosts.letest b/ansible/hosts.letest
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.letest
+++ /dev/null
diff --git a/ansible/hosts.mirror b/ansible/hosts.mirror
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.mirror
+++ /dev/null
diff --git a/ansible/hosts.obnam b/ansible/hosts.obnam
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.obnam
+++ /dev/null
diff --git a/ansible/hosts.shell b/ansible/hosts.shell
deleted file mode 100644
index 1b142ae..0000000
--- a/ansible/hosts.shell
+++ /dev/null
@@ -1 +0,0 @@
-shell ansible_ssh_host=shell-shell.vm.liw.fi
diff --git a/ansible/hosts.subplot-dan b/ansible/hosts.subplot-dan
deleted file mode 100644
index e69de29..0000000
--- a/ansible/hosts.subplot-dan
+++ /dev/null
diff --git a/ansible/http.liw.fi.hz b/ansible/http.liw.fi.hz
deleted file mode 100644
index ad22c6b..0000000
--- a/ansible/http.liw.fi.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cpx11
- image: debian-10
-hosts:
- - name: static
diff --git a/ansible/http.liw.fi.yml b/ansible/http.liw.fi.yml
index b658a63..f40c078 100644
--- a/ansible/http.liw.fi.yml
+++ b/ansible/http.liw.fi.yml
@@ -1,4 +1,4 @@
-- hosts: static
+- hosts: http.liw.fi
remote_user: root
roles:
- role: sane_debian_system
diff --git a/ansible/irc.liw.fi.hz b/ansible/irc.liw.fi.hz
deleted file mode 100644
index 487bd5d..0000000
--- a/ansible/irc.liw.fi.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cx11
- image: debian-10
-hosts:
- - name: irc
diff --git a/ansible/irc.liw.fi.yml b/ansible/irc.liw.fi.yml
index b8abd5c..0c24437 100644
--- a/ansible/irc.liw.fi.yml
+++ b/ansible/irc.liw.fi.yml
@@ -1,4 +1,4 @@
-- hosts: irc
+- hosts: irc.liw.fi
remote_user: root
roles:
- role: sane_debian_system
diff --git a/ansible/letest-letest.vm.liw.fi.hz b/ansible/letest-letest.vm.liw.fi.hz
deleted file mode 100644
index 919af09..0000000
--- a/ansible/letest-letest.vm.liw.fi.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cx11
- image: debian-10
-hosts:
- - name: letest
diff --git a/ansible/apt-dev.yml b/ansible/maybe-someday/apt-dev.yml
index 54c3d99..54c3d99 100644
--- a/ansible/apt-dev.yml
+++ b/ansible/maybe-someday/apt-dev.yml
diff --git a/ansible/billion.yml b/ansible/maybe-someday/billion.yml
index 841ad45..841ad45 100644
--- a/ansible/billion.yml
+++ b/ansible/maybe-someday/billion.yml
diff --git a/ansible/clab-dev.yml b/ansible/maybe-someday/clab-dev.yml
index 5d386e3..5d386e3 100644
--- a/ansible/clab-dev.yml
+++ b/ansible/maybe-someday/clab-dev.yml
diff --git a/ansible/contractor-dev.yml b/ansible/maybe-someday/contractor-dev.yml
index 0ef3722..0ef3722 100644
--- a/ansible/contractor-dev.yml
+++ b/ansible/maybe-someday/contractor-dev.yml
diff --git a/ansible/debian-mirror.yml b/ansible/maybe-someday/debian-mirror.yml
index 1b85a21..1b85a21 100644
--- a/ansible/debian-mirror.yml
+++ b/ansible/maybe-someday/debian-mirror.yml
diff --git a/ansible/debmirror.yml b/ansible/maybe-someday/debmirror.yml
index 88aa1c1..88aa1c1 100644
--- a/ansible/debmirror.yml
+++ b/ansible/maybe-someday/debmirror.yml
diff --git a/ansible/ewww-dev.yml b/ansible/maybe-someday/ewww-dev.yml
index 5a24d37..5a24d37 100644
--- a/ansible/ewww-dev.yml
+++ b/ansible/maybe-someday/ewww-dev.yml
diff --git a/ansible/ewww-test.yml b/ansible/maybe-someday/ewww-test.yml
index 67b2123..67b2123 100644
--- a/ansible/ewww-test.yml
+++ b/ansible/maybe-someday/ewww-test.yml
diff --git a/ansible/ick2-dev.yml b/ansible/maybe-someday/ick2-dev.yml
index 6a8b0c6..6a8b0c6 100644
--- a/ansible/ick2-dev.yml
+++ b/ansible/maybe-someday/ick2-dev.yml
diff --git a/ansible/jt-dev.yml b/ansible/maybe-someday/jt-dev.yml
index ccb405b..ccb405b 100644
--- a/ansible/jt-dev.yml
+++ b/ansible/maybe-someday/jt-dev.yml
diff --git a/ansible/letest-letest.vm.liw.fi.yml b/ansible/maybe-someday/letest-letest.vm.liw.fi.yml
index c9555dc..c9555dc 100644
--- a/ansible/letest-letest.vm.liw.fi.yml
+++ b/ansible/maybe-someday/letest-letest.vm.liw.fi.yml
diff --git a/ansible/openpgp-ca-dev.yml b/ansible/maybe-someday/openpgp-ca-dev.yml
index 52afa6c..52afa6c 100644
--- a/ansible/openpgp-ca-dev.yml
+++ b/ansible/maybe-someday/openpgp-ca-dev.yml
diff --git a/ansible/openpgp-card-dev.yml b/ansible/maybe-someday/openpgp-card-dev.yml
index 30c528f..30c528f 100644
--- a/ansible/openpgp-card-dev.yml
+++ b/ansible/maybe-someday/openpgp-card-dev.yml
diff --git a/ansible/python-mess.yml b/ansible/maybe-someday/python-mess.yml
index 3cbdc91..3cbdc91 100644
--- a/ansible/python-mess.yml
+++ b/ansible/maybe-someday/python-mess.yml
diff --git a/ansible/roadmap-dev.yml b/ansible/maybe-someday/roadmap-dev.yml
index ac98d3a..ac98d3a 100644
--- a/ansible/roadmap-dev.yml
+++ b/ansible/maybe-someday/roadmap-dev.yml
diff --git a/ansible/rust-dev.yml b/ansible/maybe-someday/rust-dev.yml
index 23d9ba5..23d9ba5 100644
--- a/ansible/rust-dev.yml
+++ b/ansible/maybe-someday/rust-dev.yml
diff --git a/ansible/sq-test.yml b/ansible/maybe-someday/sq-test.yml
index 5879ef1..5879ef1 100644
--- a/ansible/sq-test.yml
+++ b/ansible/maybe-someday/sq-test.yml
diff --git a/ansible/ssh-dev.yml b/ansible/maybe-someday/ssh-dev.yml
index 3b05e70..3b05e70 100644
--- a/ansible/ssh-dev.yml
+++ b/ansible/maybe-someday/ssh-dev.yml
diff --git a/ansible/shell-shell.vm.liw.fi.hz b/ansible/shell-shell.vm.liw.fi.hz
deleted file mode 100644
index d2abde0..0000000
--- a/ansible/shell-shell.vm.liw.fi.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cx11
- image: debian-10
-hosts:
- - name: shell
diff --git a/ansible/shell-shell.vm.liw.fi.yml b/ansible/shell-shell.vm.liw.fi.yml
index 9cd9738..0d7deb1 100644
--- a/ansible/shell-shell.vm.liw.fi.yml
+++ b/ansible/shell-shell.vm.liw.fi.yml
@@ -1,4 +1,4 @@
-- hosts: shell
+- hosts: shell-shell.vm.liw.fi
remote_user: root
roles:
- role: sane_debian_system
diff --git a/ansible/subplot-dan.hz b/ansible/subplot-dan.hz
deleted file mode 100644
index 8038af3..0000000
--- a/ansible/subplot-dan.hz
+++ /dev/null
@@ -1,5 +0,0 @@
-defaults:
- type: cx21
- image: debian-10
-hosts:
- - name: dev
diff --git a/vmadm/stamina/openpgp-ca-dev.yaml b/vmadm/someday-maybe/openpgp-ca-dev.yaml
index 237b99c..237b99c 100644
--- a/vmadm/stamina/openpgp-ca-dev.yaml
+++ b/vmadm/someday-maybe/openpgp-ca-dev.yaml
diff --git a/vmadm/stamina/openpgp-card-dev.yaml b/vmadm/someday-maybe/openpgp-card-dev.yaml
index f151f53..f151f53 100644
--- a/vmadm/stamina/openpgp-card-dev.yaml
+++ b/vmadm/someday-maybe/openpgp-card-dev.yaml
diff --git a/vmadm/stamina/solokeys-website.yaml b/vmadm/stamina/solokeys-website.yaml
deleted file mode 100644
index 744a1de..0000000
--- a/vmadm/stamina/solokeys-website.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-solokeys-website:
- autostart: true
- cpus: 2
- memory_mib: 8192