aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/borg/borg.yml1
-rw-r--r--ansible/borg/group_vars/all.yml (renamed from ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml)0
-rw-r--r--ansible/inventory6
-rw-r--r--ansible/roles/borg-target/tasks/borg-init.yml4
4 files changed, 5 insertions, 6 deletions
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/borg-malabaricus/borg-secrets.yml b/ansible/borg/group_vars/all.yml
index 9336f3b..9336f3b 100644
--- a/ansible/borg/group_vars/borg-malabaricus/borg-secrets.yml
+++ b/ansible/borg/group_vars/all.yml
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 }}"