summaryrefslogtreecommitdiff
path: root/ansible/roles
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-08-08 08:41:13 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2019-08-08 09:03:33 +0200
commitd3197b81c89dab8f0eb412037aec42f38f0cc189 (patch)
treec59017437113a70d24c533a3cc64db80f433fdd8 /ansible/roles
parent4547d44907029530b9d2b56f609e562daf99848c (diff)
downloadinfra-d3197b81c89dab8f0eb412037aec42f38f0cc189.tar.gz
infra-d3197b81c89dab8f0eb412037aec42f38f0cc189.tar.bz2
infra-d3197b81c89dab8f0eb412037aec42f38f0cc189.tar.xz
infra-d3197b81c89dab8f0eb412037aec42f38f0cc189.zip
borg: Adding arius.
borg-target: Adding pipelining.
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/borg-target/tasks/borg-init.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/ansible/roles/borg-target/tasks/borg-init.yml b/ansible/roles/borg-target/tasks/borg-init.yml
index 513b7d3..2f6efe6 100644
--- a/ansible/roles/borg-target/tasks/borg-init.yml
+++ b/ansible/roles/borg-target/tasks/borg-init.yml
@@ -6,7 +6,9 @@
success_msg: ""
- set_fact:
- ssh_key: "{{ client.value.ssh_key_path if client.value.ssh_key_path is defined else ('files/borg/' + client.key + '/ssh-key') }}"
+ ssh_key: "{{ client.value.ssh_key_path if client.value.ssh_key_path is defined else default_file_path }}"
+ vars:
+ default_file_path: "files/borg/{{ client.key }}/ssh-key"
- debug: var=ssh_key
- with_items: "{{ client.value.repos }}"
@@ -20,8 +22,8 @@
path: "{{ borg_target__home }}/repos/{{ client.key }}/{{ item }}"
- with_items: "{{ client.value.repos }}"
- name: borg init
become_user: "{{ borg_target__user }}"
+ name: borg init
command: "borg init --encryption repokey {{ path }}"
args:
creates: "{{ path }}"
@@ -29,6 +31,7 @@
BORG_PASSPHRASE: "{{ borg__passphrases[client.key][item] }}"
vars:
path: "{{ borg_target__home }}/repos/{{ client.key }}/{{ item }}"
+ ansible_ssh_pipelining: true
- local_action:
module: stat