diff --git a/roles/backup_client/templates/duply_main_conf.j2 b/roles/backup_client/templates/duply_main_conf.j2 index ccd7f5d79829c425fff9b32d4735d851263511c5..b2ff4393f658c7a3f8965c28eb4c80a4c3cfd2ab 100644 --- a/roles/backup_client/templates/duply_main_conf.j2 +++ b/roles/backup_client/templates/duply_main_conf.j2 @@ -9,11 +9,7 @@ GPG_KEY_SIGN='{{ backup_encryption_key_id.stdout }}' GPG_OPTS="--homedir /etc/duply/main/gnupg/ --trust-model always" # Destination where the backups are stored at. -{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' %} TARGET='pexpect+sftp://{{ backup_client_username }}@{{ backup_server }}:{{ backup_server_port }}/{{ backup_server_destination }}' -{% else %} -TARGET='sftp://{{ backup_client_username }}@{{ backup_server }}:{{ backup_server_port }}/{{ backup_server_destination }}' -{% endif %} # Base directory to backup (root). File selection is done via include/exclude # patterns. @@ -51,11 +47,7 @@ DUPL_PARAMS="$DUPL_PARAMS --use-agent" # ssh-options. Use dedicated known hosts and identity file when connecting over # SFTP. Using -oLogLevel=ERROR makes output a bit less verbose. This is mainly # to avoid output from sftp telling us it added IP address to known_hosts. -{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' %} DUPL_PARAMS="$DUPL_PARAMS --ssh-options='-oLogLevel=ERROR -oUserKnownHostsFile=/dev/null -oGlobalKnownHostsFile=/etc/duply/main/ssh/known_hosts -oIdentityFile=/etc/duply/main/ssh/identity'" -{% else %} -DUPL_PARAMS="$DUPL_PARAMS --ssh-backend pexpect --ssh-options='-oLogLevel=ERROR -oUserKnownHostsFile=/dev/null -oGlobalKnownHostsFile=/etc/duply/main/ssh/known_hosts -oIdentityFile=/etc/duply/main/ssh/identity'" -{% endif %} # By default we exclude everything, and then include only specific patterns. DUPL_PARAMS="$DUPL_PARAMS --include-globbing-filelist /etc/duply/main/include"