diff --git a/CHANGES.rst b/CHANGES.rst index 9fce072..26f9e62 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,12 @@ v0.1.5 - Add ``/lib32`` directory to the list of default excluded directories. [drybjed] +- Disable ``ssh_args`` setting on Debian Jessie due to `Debian Bug #717451`_ to + allow backups to run. It will be re-enabled when a fix is released in future + Jessie point release. [drybjed] + +.. _Debian Bug #717451: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717451 + v0.1.4 ------ diff --git a/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 b/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 index 1d578d9..997a8c6 100644 --- a/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 +++ b/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 @@ -177,7 +177,15 @@ lockfile /var/run/rsnapshot-{{ rsnapshot_tpl_host }}.pid # ssh has no args passed by default, but you can specify some here. # +{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' %} +# In Debian Jessie, rsnapshot has a bug related to 'ssh_args' option, +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717451 +# Until a bugfix is released, 'ssh_args' option is disabled by default to allow +# for backups to be processed +#ssh_args {{ host.ssh_args | default(rsnapshot_ssh_args | default("-p 22")) }} +{% else %} ssh_args {{ host.ssh_args | default(rsnapshot_ssh_args | default("-p 22")) }} +{% endif %} # Default arguments for the "du" program (for disk space reporting). # The GNU version of "du" is preferred. See the man page for more details. diff --git a/templates/etc/rsnapshot/server/rsnapshot.conf.j2 b/templates/etc/rsnapshot/server/rsnapshot.conf.j2 index 7cf2f87..7022dfe 100644 --- a/templates/etc/rsnapshot/server/rsnapshot.conf.j2 +++ b/templates/etc/rsnapshot/server/rsnapshot.conf.j2 @@ -184,7 +184,15 @@ lockfile /var/run/rsnapshot-{{ rsnapshot_tpl_host }}.pid # ssh has no args passed by default, but you can specify some here. # +{% if ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' %} +# In Debian Jessie, rsnapshot has a bug related to 'ssh_args' option, +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717451 +# Until a bugfix is released, 'ssh_args' option is disabled by default to allow +# for backups to be processed +#ssh_args {{ host.rsnapshot_ssh_args | default(rsnapshot_ssh_args | default("-p 22")) }} +{% else %} ssh_args {{ host.rsnapshot_ssh_args | default(rsnapshot_ssh_args | default("-p 22")) }} +{% endif %} # Default arguments for the "du" program (for disk space reporting). # The GNU version of "du" is preferred. See the man page for more details.