From 8424db9d69df4cdef3097e8a03c29b1d6829d0e8 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 15 May 2019 20:32:57 +0200
Subject: o Borg: some bugs.

---
 ansible/borg/borg.yml                                  |  1 +
 ansible/borg/group_vars/all.yml                        | 18 ++++++++++++++++++
 .../borg/group_vars/borg-malabaricus/borg-secrets.yml  | 18 ------------------
 ansible/inventory                                      |  6 ++----
 ansible/roles/borg-target/tasks/borg-init.yml          |  4 ++--
 5 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 ansible/borg/group_vars/all.yml
 delete mode 100644 ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml

diff --git a/ansible/borg/borg.yml b/ansible/borg/borg.yml
index b93780d..6b57d79 100644
--- a/ansible/borg/borg.yml
+++ b/ansible/borg/borg.yml
@@ -25,6 +25,7 @@
 
 - hosts:
     - conflatorio
+    - birgitte
   roles:
     - role: borg-job
       tags: borg-job
diff --git a/ansible/borg/group_vars/all.yml b/ansible/borg/group_vars/all.yml
new file mode 100644
index 0000000..9336f3b
--- /dev/null
+++ b/ansible/borg/group_vars/all.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+63386637353831373333643735383234383361643332373038363632393935653238623036623234
+3063383063323436396337356531313933626537353438360a353735666338336638343432306631
+38343963623261663933653735326264613964303138336630306431393864376465393362633963
+3264653032316333660a653932383264366633343361333934383961383461366637396138393530
+39646563386535656264636630323932303531653733343736653234663437666262656564363531
+64396138646364323039643762623835366363346264353538363431393063396666376534313832
+62356566306639333661663532363663646262353861396638323964373466656331336434656538
+30636262643335363763393139306262346339393563343737306639363962613836336633656439
+39393466373836386462303037663830383931383862663563343238643866303437346530323361
+31343139313366326634663335353235643832383064616161356565333432646130333131646337
+65356263313035396330343932363334333031623133363632623634303766383564353337333262
+32303739653738616632303664656334356666333830333931386635363437373237363138343836
+33393339303933306537356330353439623231656535663861633833323566626666336138323032
+37656665643861636363343131623838396338653034363833396538346364656235353431653339
+66643430306531383265346339623339666232363261653463333865386536393738353231376361
+30633765386237373763323837656165363431396136636662373430623937326366303834373064
+6132
diff --git a/ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml b/ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml
deleted file mode 100644
index 9336f3b..0000000
--- a/ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-63386637353831373333643735383234383361643332373038363632393935653238623036623234
-3063383063323436396337356531313933626537353438360a353735666338336638343432306631
-38343963623261663933653735326264613964303138336630306431393864376465393362633963
-3264653032316333660a653932383264366633343361333934383961383461366637396138393530
-39646563386535656264636630323932303531653733343736653234663437666262656564363531
-64396138646364323039643762623835366363346264353538363431393063396666376534313832
-62356566306639333661663532363663646262353861396638323964373466656331336434656538
-30636262643335363763393139306262346339393563343737306639363962613836336633656439
-39393466373836386462303037663830383931383862663563343238643866303437346530323361
-31343139313366326634663335353235643832383064616161356565333432646130333131646337
-65356263313035396330343932363334333031623133363632623634303766383564353337333262
-32303739653738616632303664656334356666333830333931386635363437373237363138343836
-33393339303933306537356330353439623231656535663861633833323566626666336138323032
-37656665643861636363343131623838396338653034363833396538346364656235353431653339
-66643430306531383265346339623339666232363261653463333865386536393738353231376361
-30633765386237373763323837656165363431396136636662373430623937326366303834373064
-6132
diff --git a/ansible/inventory b/ansible/inventory
index 1f50459..60f3ac3 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -122,11 +122,9 @@ all:
 # Borg
     borg-malabaricus:
       hosts:
-#        birgitte:
+        birgitte:
         conflatorio:
-#        arius:
-#      vars:
-#        borg_client__server: malabaricus.trygvis.io
+        arius:
 
     borg_clients:
       children:
diff --git a/ansible/roles/borg-target/tasks/borg-init.yml b/ansible/roles/borg-target/tasks/borg-init.yml
index 21b86d6..513b7d3 100644
--- a/ansible/roles/borg-target/tasks/borg-init.yml
+++ b/ansible/roles/borg-target/tasks/borg-init.yml
@@ -1,7 +1,7 @@
 - with_items: "{{ client.value.repos }}"
   assert:
     that:
-      - "item in borg_target__passphrases[client.key]"
+      - "item in borg__passphrases[client.key]"
     fail_msg: "{{ item }} is missing from borg-secrets.yml"
     success_msg: ""
 
@@ -26,7 +26,7 @@
   args:
     creates: "{{ path }}"
   environment: 
-    BORG_PASSPHRASE: "{{ borg_target__passphrases[client.key][item] }}"
+    BORG_PASSPHRASE: "{{ borg__passphrases[client.key][item] }}"
   vars:
     path: "{{ borg_target__home }}/repos/{{ client.key }}/{{ item }}"
 
-- 
cgit v1.2.3