From edcec5dd41c6de5a2ae2eb4078491a7db3200052 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Mon, 16 Aug 2021 23:48:10 +0200
Subject: [PATCH] Bump and new hosts.

---
 ansible/hosts                   | 8 +++++++-
 ansible/requirements.txt        | 4 ++--
 cloud-init/arm-ubuntu/user-data | 6 ++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ansible/hosts b/ansible/hosts
index 5b4c451..c18deba 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -1,7 +1,13 @@
+[arm64]
+devpi docker_apt_arch=arm64
+
 [piholes]
 pihole set_hostname=pihole."{{ secret_local_domain }}"
+pihole2 set_hostname=pihole2."{{ secret_local_domain }}"
 
-;[docker]
+[docker]
+devpi set_hostname=devpi."{{ secret_local_domain }}"
+10.0.0.120 set_hostname=servy."{{ secret_local_domain }}"
 ;10.0.0.40
 ;10.0.0.41
 ;10.0.0.42
diff --git a/ansible/requirements.txt b/ansible/requirements.txt
index c9f5354..ab943d1 100644
--- a/ansible/requirements.txt
+++ b/ansible/requirements.txt
@@ -1,3 +1,3 @@
-ansible==2.10.0
-ansible-base==2.10.2
+ansible==4.4.0
+ansible-base==2.10.13
 jmespath
\ No newline at end of file
diff --git a/cloud-init/arm-ubuntu/user-data b/cloud-init/arm-ubuntu/user-data
index fe3ca3a..a12d883 100644
--- a/cloud-init/arm-ubuntu/user-data
+++ b/cloud-init/arm-ubuntu/user-data
@@ -24,7 +24,5 @@ system_info:
   default_user:
     name: roxedus
     plain_text_passwd: roxedus
-    home: /home/roxedus
-    shell: /bin/bash
-    lock_passwd: True
-    groups: [adm, audio, cdrom, dialout, floppy, video, plugdev, dip, netdev]
+    ssh_import_id:
+      - gh:Roxedus