aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-01-11 07:44:25 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2019-01-11 07:44:25 +0100
commitfca718acb8d31e3f05608fb5aedfa4c7d34c7455 (patch)
treea4092cfe481db341a4517817361e4e31fd638376 /ansible
parent06928fc1edfbf63a0496843ff4c0c16011cd1444 (diff)
downloadinfra-fca718acb8d31e3f05608fb5aedfa4c7d34c7455.tar.gz
infra-fca718acb8d31e3f05608fb5aedfa4c7d34c7455.tar.bz2
infra-fca718acb8d31e3f05608fb5aedfa4c7d34c7455.tar.xz
infra-fca718acb8d31e3f05608fb5aedfa4c7d34c7455.zip
borg: Adding arius.
Diffstat (limited to 'ansible')
-rw-r--r--ansible/borg.yml10
-rw-r--r--ansible/files/arius/etc/borg/id_ed25519.pub1
-rw-r--r--ansible/group_vars/all/users.yml4
-rw-r--r--ansible/host_vars/arius/borg.yml (renamed from ansible/host_vars/fuckaduck/borg.yml)0
-rw-r--r--ansible/host_vars/malabaricus/borg-server.yml4
-rw-r--r--ansible/inventory1
6 files changed, 12 insertions, 8 deletions
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/fuckaduck/borg.yml b/ansible/host_vars/arius/borg.yml
index c4165ff..c4165ff 100644
--- a/ansible/host_vars/fuckaduck/borg.yml
+++ b/ansible/host_vars/arius/borg.yml
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