diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2019-05-15 20:32:57 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2019-08-08 09:03:13 +0200 |
| commit | 8424db9d69df4cdef3097e8a03c29b1d6829d0e8 (patch) | |
| tree | 7a262e653d8bae6426435f7a29d5ba169213191f | |
| parent | d341e8a0967e3a186e2112c6fc55988e50523a9a (diff) | |
| download | infra-8424db9d69df4cdef3097e8a03c29b1d6829d0e8.tar.gz infra-8424db9d69df4cdef3097e8a03c29b1d6829d0e8.tar.bz2 infra-8424db9d69df4cdef3097e8a03c29b1d6829d0e8.tar.xz infra-8424db9d69df4cdef3097e8a03c29b1d6829d0e8.zip | |
o Borg: some bugs.
| -rw-r--r-- | ansible/borg/borg.yml | 1 | ||||
| -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/inventory | 6 | ||||
| -rw-r--r-- | ansible/roles/borg-target/tasks/borg-init.yml | 4 |
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 }}" |