Skip to content

Commit

Permalink
Disable 'ssh_args' option on Debian Jessie
Browse files Browse the repository at this point in the history
Due to Debian Bug #717451 rsnapshot stops creating backups on currently
released Debian Jessie hosts. Configuration of ssh arguments will be
enabled when a fix is released in a point release. More information:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717451
  • Loading branch information
drybjed committed Apr 30, 2015
1 parent 4b44a1f commit 7380957
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------

Expand Down
8 changes: 8 additions & 0 deletions templates/etc/rsnapshot/external-server/rsnapshot.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 8 additions & 0 deletions templates/etc/rsnapshot/server/rsnapshot.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 7380957

Please sign in to comment.