From 0aa85752278a871ead1f0564d692add28fa92c54 Mon Sep 17 00:00:00 2001 From: Dieter Verhelst Date: Thu, 11 Jan 2018 23:26:43 +0100 Subject: [PATCH] Making it possible to define shell and support other os-ses --- defaults/main.yml | 4 ++++ tasks/borg-client.yml | 4 ++-- tasks/install.yml | 4 ++-- templates/borg-backup.sh.j2 | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index cd13ae7..cc09f97 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -37,3 +37,7 @@ borgbackup_appendonly: False borgbackup_management_station: '' borgbackup_management_user: '' borgbackup_management_ssh_pubkey: '' + +borgbackup_owner: root +borgbackup_group: root +borgbackup_shell: "/bin/bash" diff --git a/tasks/borg-client.yml b/tasks/borg-client.yml index fbd6ffa..3505876 100644 --- a/tasks/borg-client.yml +++ b/tasks/borg-client.yml @@ -96,8 +96,8 @@ template: src: "borg-backup.sh.j2" dest: "/usr/local/bin/borg-backup" - owner: "root" - group: "root" + owner: "{{ borgbackup_owner }}" + group: "{{ borgbackup_group }}" mode: "0744" - name: client | create backup-directory on backup server diff --git a/tasks/install.yml b/tasks/install.yml index 87ff287..1a59145 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -3,8 +3,8 @@ get_url: dest: "/usr/local/bin/borg" checksum: "{{ borgbackup_checksum }}" - owner: "root" - group: "root" + owner: "{{ borgbackup_owner }}" + group: "{{ borgbackup_group }}" mode: "0755" url: "{{ borgbackup_download_url }}" tags: borginstall diff --git a/templates/borg-backup.sh.j2 b/templates/borg-backup.sh.j2 index bf85067..3f89d6d 100644 --- a/templates/borg-backup.sh.j2 +++ b/templates/borg-backup.sh.j2 @@ -1,4 +1,4 @@ -#!/bin/bash +#!{{ borgbackup_shell }} if [ -z "$1" ] || [ ! -z "$2" ] then