From fca718acb8d31e3f05608fb5aedfa4c7d34c7455 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Fri, 11 Jan 2019 07:44:25 +0100
Subject: borg: Adding arius.

---
 ansible/borg.yml                              | 10 +++++-----
 ansible/files/arius/etc/borg/id_ed25519.pub   |  1 +
 ansible/group_vars/all/users.yml              |  4 +++-
 ansible/host_vars/arius/borg.yml              |  7 +++++++
 ansible/host_vars/fuckaduck/borg.yml          |  7 -------
 ansible/host_vars/malabaricus/borg-server.yml |  4 ++--
 ansible/inventory                             |  1 +
 7 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 ansible/files/arius/etc/borg/id_ed25519.pub
 create mode 100644 ansible/host_vars/arius/borg.yml
 delete mode 100644 ansible/host_vars/fuckaduck/borg.yml

(limited to 'ansible')

diff --git a/ansible/borg.yml b/ansible/borg.yml
index b68b342..57ae3de 100644
--- a/ansible/borg.yml
+++ b/ansible/borg.yml
@@ -1,10 +1,10 @@
----
+# Add clients first so that their public key is available.
 - hosts:
-    - borg_servers
+    - borg_clients
   roles:
-    - borg-server
+    - borg-client
 
 - hosts:
-    - borg_clients
+    - borg_servers
   roles:
-    - borg-client
+    - borg-server
diff --git a/ansible/files/arius/etc/borg/id_ed25519.pub b/ansible/files/arius/etc/borg/id_ed25519.pub
new file mode 100644
index 0000000..b82aee1
--- /dev/null
+++ b/ansible/files/arius/etc/borg/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHUFseA3R1t/ebJFmAZ890YUfoXaTFcsYAMB8vwJjR+n for borg @ arius
diff --git a/ansible/group_vars/all/users.yml b/ansible/group_vars/all/users.yml
index 7720f4b..951eab5 100644
--- a/ansible/group_vars/all/users.yml
+++ b/ansible/group_vars/all/users.yml
@@ -6,9 +6,11 @@ users:
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMRccGxF1l7xIUavu5vDqypCe/aon3+bdFgEhPa7pPb trygvis@arius-v3
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/Xrsk69KhaXdHPcbBoCbqlQ2DXmx77OnkLAk22ui5m trygvis@malabaricus
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKXVnzqo+JTVNrt3p0LGeH59DPMc9WkVMXO3wpAyTH6 trygvis@akili
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGpWssvnarp8O/oN86VDlLxUHAYHSKbdhXpe1s0hWkX5 trygvis@fuckaduck
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3UZyrbXX7WMHqcZCRspkoSIfB6egrbOxXPf1zyZkAw trygvis@arius-v4
 
+    authorized_keys_absent:
+      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGpWssvnarp8O/oN86VDlLxUHAYHSKbdhXpe1s0hWkX5 trygvis@fuckaduck
+
 lusers:
   - trygvis
 
diff --git a/ansible/host_vars/arius/borg.yml b/ansible/host_vars/arius/borg.yml
new file mode 100644
index 0000000..c4165ff
--- /dev/null
+++ b/ansible/host_vars/arius/borg.yml
@@ -0,0 +1,7 @@
+borg_client__state: present
+borg_client__patterns:
+  - -/proc
+  - -/dev
+  - -/run
+  - -/sys
+  - -/home/*/.cache
diff --git a/ansible/host_vars/fuckaduck/borg.yml b/ansible/host_vars/fuckaduck/borg.yml
deleted file mode 100644
index c4165ff..0000000
--- a/ansible/host_vars/fuckaduck/borg.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-borg_client__state: present
-borg_client__patterns:
-  - -/proc
-  - -/dev
-  - -/run
-  - -/sys
-  - -/home/*/.cache
diff --git a/ansible/host_vars/malabaricus/borg-server.yml b/ansible/host_vars/malabaricus/borg-server.yml
index bb7a961..84a6ecd 100644
--- a/ansible/host_vars/malabaricus/borg-server.yml
+++ b/ansible/host_vars/malabaricus/borg-server.yml
@@ -1,6 +1,6 @@
+borg_arius:
+  state: present
 borg_birgitte:
   state: present
 borg_conflatorio:
   state: present
-borg_fuckaduck:
-  state: present
diff --git a/ansible/inventory b/ansible/inventory
index d413177..9b620d5 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -99,6 +99,7 @@ all:
       hosts:
         birgitte:
         conflatorio:
+        arius:
       vars:
         borg_client__server: malabaricus.trygvis.io
 
-- 
cgit v1.2.3