port to current debian-ansible

9 files changed, 63 insertions, 33 deletions

diff --git a/ansible/all.sh b/ansible/all.sh
index a955d46..0682b10 100755
--- a/ansible/all.sh
+++ b/ansible/all.sh
@@ -2,7 +2,8 @@
 
 set -eu
 
-for playbook in atuin.yml exolobe1.yml exolobe2.yml exolobe5.yml holywood2.yml
+for playbook in atuin.yml exolobe1.yml exolobe2.yml exolobe5.yml holywood2.yml contractor-dev.yml \
+			  debmirror.yml vmdb2-dev.yml
 do
     echo "$playbook"
     chronic ./run-playbook "$playbook"
@@ -25,3 +26,6 @@ chronic run-ansible irc.liw.fi.hz hosts.irc irc.liw.fi.yml
 
 echo shell.liw.fi
 chronic run-ansible shell.liw.fi.hz hosts.shell shell.liw.fi.yml
+
+echo letest-letest.vm.liw.fi
+chronic run-ansible letest.fi.hz hosts.letest letest.yml
diff --git a/ansible/contractor-dev.yml b/ansible/contractor-dev.yml
index ce7bf90..a9a709c 100644
--- a/ansible/contractor-dev.yml
+++ b/ansible/contractor-dev.yml
@@ -30,6 +30,9 @@
         mode: 0600
 
   vars:
+    sane_debian_system_version: 0
+    unix_users_version: 0
+
     hostname: contractor-dev
     debian_codename: buster
 
diff --git a/ansible/debmirror.yml b/ansible/debmirror.yml
index 1bf297a..2f1617c 100644
--- a/ansible/debmirror.yml
+++ b/ansible/debmirror.yml
@@ -11,6 +11,9 @@
       tags: [mirror]
     - role: smarthost-client
   vars:
+    sane_debian_system_version: 0
+    unix_users_version: 0
+
     hostname: debmirror
     debian_codename: buster
     debian_mirror: deb.debian.org
diff --git a/ansible/exolobe4.yml b/ansible/exolobe4.yml
index 4b85a6f..eb7b841 100644
--- a/ansible/exolobe4.yml
+++ b/ansible/exolobe4.yml
@@ -22,6 +22,9 @@
     - zram
     - rust-dev-env
   vars:
+    sane_debian_system_version: 0
+    unix_users_version: 0
+
     hostname: exolobe4
     debian_codename: buster
 
diff --git a/ansible/letest.yml b/ansible/letest.yml
index 853325a..8f11142 100644
--- a/ansible/letest.yml
+++ b/ansible/letest.yml
@@ -6,6 +6,9 @@
 #    - self-updating-system
     - letest
   vars:
+    sane_debian_system_version: 0
+    unix_users_version: 0
+
     hostname: letest
     debian_codename: buster
     debian_mirror: deb.debian.org
diff --git a/ansible/subplot-dan.hz b/ansible/subplot-dan.hz
new file mode 100644
index 0000000..8038af3
--- /dev/null
+++ b/ansible/subplot-dan.hz
@@ -0,0 +1,5 @@
+defaults:
+  type: cx21
+  image: debian-10
+hosts:
+  - name: dev
diff --git a/ansible/subplot-dan.yml b/ansible/subplot-dan.yml
new file mode 100644
index 0000000..0f6493f
--- /dev/null
+++ b/ansible/subplot-dan.yml
@@ -0,0 +1,38 @@
+- hosts: dev
+  remote_user: root
+  roles:
+    - sane_debian_system
+    - comfortable-debian-system
+    - unix_users
+    - self-updating-system
+  tasks:
+    - apt:
+        name:
+          - curl
+          - build-essential
+          - clang
+          - pkg-config
+          - nettle-dev
+          - libssl-dev
+          - capnproto
+          - libsqlite3-dev
+  vars:
+    hostname: subplot-dev
+    debian_codename: buster
+
+    unix_users:
+      - username: liw
+        comment: Lars Wirzenius
+        sudo: yes
+        authorized_keys: |
+          {{ liw_ssh_pub }}
+      - username: dan
+        comment: Dan
+        sudo: yes
+        authorized_keys: |
+          {{ dan_ssh_pub }}
+      - username: dsilvers
+        comment: Daniel
+        sudo: yes
+        authorized_keys: |
+          {{ dsilvers_ssh_pub }}
diff --git a/ansible/vmdb2-dev.yml b/ansible/vmdb2-dev.yml
index 1c2bb5e..63dfcec 100644
--- a/ansible/vmdb2-dev.yml
+++ b/ansible/vmdb2-dev.yml
@@ -28,6 +28,9 @@
           - kpartx
           - subplot
   vars:
+    sane_debian_system_version: 0
+    unix_users_version: 0
+
     hostname: vmdb2-dev
     debian_codename: buster
     ansible_python_interpreter: python3
diff --git a/ansible/willikins.yml b/ansible/willikins.yml
deleted file mode 100644
index bcf87dc..0000000
--- a/ansible/willikins.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- hosts: willikins
-  remote_user: ansible
-  become: yes
-  roles:
-    - sane_debian_system
-    - self-updating-system
-    - comfortable-debian-system
-    - unix_users
-    - storage_system
-    - self-updating-system
-  vars:
-    hostname: willikins
-    debian_codename: buster
-
-    locales:
-      - fi_FI.UTF-8
-      - en_GB.UTF-8
-
-    unix_users:
-      - username: liw
-        comment: Lars Wirzenius
-        sudo: yes
-        authorized_keys: |
-          {{ liw_ssh_pub }}
-      - username: root
-        authorized_keys: |
-          {{ root_at_holywood2_ssh_key_pub }}
-
-    sources_lists:
-      - repo: "deb http://code.liw.fi/debian unstable main"
-        keyring_package: code.liw.fi-keyring
-        signing_key: "{{ code_liw_fi_signing_key }}"