From abaa10ded7cf5ad1db6c89a9f401fc2dbbbe5230 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Thu, 6 Aug 2015 12:28:38 +0200 Subject: [PATCH] Fixed ansible_managed because the text is not default. * Would not be found be https://github.com/debops/debops/issues/120 * git ls-files | xargs sed -i 's/This file is managed remotely, all changes will be lost/{{ ansible_managed }}/' --- templates/etc/cron/rsnapshot-wrapper.j2 | 2 +- templates/etc/logrotate.d/rsnapshot.j2 | 2 +- templates/etc/rsnapshot/external-server/exclude.txt.j2 | 2 +- templates/etc/rsnapshot/external-server/include.txt.j2 | 2 +- templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 | 2 +- templates/etc/rsnapshot/external-server/runner.j2 | 2 +- templates/etc/rsnapshot/server/exclude.txt.j2 | 2 +- templates/etc/rsnapshot/server/include.txt.j2 | 2 +- templates/etc/rsnapshot/server/rsnapshot.conf.j2 | 2 +- templates/etc/rsnapshot/server/runner.j2 | 2 +- templates/usr/local/lib/rsnapshot-cron-wrapper.j2 | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/etc/cron/rsnapshot-wrapper.j2 b/templates/etc/cron/rsnapshot-wrapper.j2 index 8531df7..abe9e22 100755 --- a/templates/etc/cron/rsnapshot-wrapper.j2 +++ b/templates/etc/cron/rsnapshot-wrapper.j2 @@ -1,6 +1,6 @@ #!/bin/sh -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} # Launch rsnapshot {{ item }} backups test -x {{ ansible_local.root.lib }}/rsnapshot-cron-wrapper && {{ ansible_local.root.lib }}/rsnapshot-cron-wrapper {{ item }} || true diff --git a/templates/etc/logrotate.d/rsnapshot.j2 b/templates/etc/logrotate.d/rsnapshot.j2 index 144b517..67efa02 100644 --- a/templates/etc/logrotate.d/rsnapshot.j2 +++ b/templates/etc/logrotate.d/rsnapshot.j2 @@ -1,4 +1,4 @@ -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} /var/log/rsnapshot.log /var/log/rsnapshot/*.log { rotate 6 diff --git a/templates/etc/rsnapshot/external-server/exclude.txt.j2 b/templates/etc/rsnapshot/external-server/exclude.txt.j2 index 0b04047..29e6554 100644 --- a/templates/etc/rsnapshot/external-server/exclude.txt.j2 +++ b/templates/etc/rsnapshot/external-server/exclude.txt.j2 @@ -1,5 +1,5 @@ {% set host = item.0 %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} {% if host.exclude is defined and host.exclude %} {% set rsnapshot_tpl_exclude = host.exclude %} diff --git a/templates/etc/rsnapshot/external-server/include.txt.j2 b/templates/etc/rsnapshot/external-server/include.txt.j2 index d7ba68e..20514dd 100644 --- a/templates/etc/rsnapshot/external-server/include.txt.j2 +++ b/templates/etc/rsnapshot/external-server/include.txt.j2 @@ -1,5 +1,5 @@ {% set host = item.0 %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} {% if host.include is defined and host.include %} {% set rsnapshot_tpl_include = host.include %} diff --git a/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 b/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 index a93725e..8949e3c 100644 --- a/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 +++ b/templates/etc/rsnapshot/external-server/rsnapshot.conf.j2 @@ -14,7 +14,7 @@ {% else %} {% set rsnapshot_tpl_path = '/' %} {% endif %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} ################################################# # rsnapshot.conf - rsnapshot configuration file # diff --git a/templates/etc/rsnapshot/external-server/runner.j2 b/templates/etc/rsnapshot/external-server/runner.j2 index 0b84de5..c23fd86 100755 --- a/templates/etc/rsnapshot/external-server/runner.j2 +++ b/templates/etc/rsnapshot/external-server/runner.j2 @@ -1,7 +1,7 @@ #!/bin/bash {% set host = item.0 %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} currenttype="${1:-hourly}" prevtype="${2:-null}" diff --git a/templates/etc/rsnapshot/server/exclude.txt.j2 b/templates/etc/rsnapshot/server/exclude.txt.j2 index 4b0308b..2661fbb 100644 --- a/templates/etc/rsnapshot/server/exclude.txt.j2 +++ b/templates/etc/rsnapshot/server/exclude.txt.j2 @@ -1,5 +1,5 @@ {% set host = hostvars[item.0] %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} {% if host.rsnapshot_exclude is defined and host.rsnapshot_exclude %} {% set rsnapshot_tpl_exclude = host.rsnapshot_exclude %} diff --git a/templates/etc/rsnapshot/server/include.txt.j2 b/templates/etc/rsnapshot/server/include.txt.j2 index b1cd346..053125b 100644 --- a/templates/etc/rsnapshot/server/include.txt.j2 +++ b/templates/etc/rsnapshot/server/include.txt.j2 @@ -1,5 +1,5 @@ {% set host = hostvars[item.0] %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} {% if host.rsnapshot_include is defined and host.rsnapshot_include %} {% set rsnapshot_tpl_include = host.rsnapshot_include %} diff --git a/templates/etc/rsnapshot/server/rsnapshot.conf.j2 b/templates/etc/rsnapshot/server/rsnapshot.conf.j2 index c9d0c7a..4093cd1 100644 --- a/templates/etc/rsnapshot/server/rsnapshot.conf.j2 +++ b/templates/etc/rsnapshot/server/rsnapshot.conf.j2 @@ -21,7 +21,7 @@ {% else %} {% set rsnapshot_tpl_uuid = '' %} {% endif %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} ################################################# # rsnapshot.conf - rsnapshot configuration file # diff --git a/templates/etc/rsnapshot/server/runner.j2 b/templates/etc/rsnapshot/server/runner.j2 index 1afca4d..8f66037 100755 --- a/templates/etc/rsnapshot/server/runner.j2 +++ b/templates/etc/rsnapshot/server/runner.j2 @@ -6,7 +6,7 @@ {% set rsnapshot_tpl_host = host.ansible_fqdn %} {% endif %} -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} currenttype="${1:-hourly}" prevtype="${2:-null}" diff --git a/templates/usr/local/lib/rsnapshot-cron-wrapper.j2 b/templates/usr/local/lib/rsnapshot-cron-wrapper.j2 index f50b037..fa1b982 100755 --- a/templates/usr/local/lib/rsnapshot-cron-wrapper.j2 +++ b/templates/usr/local/lib/rsnapshot-cron-wrapper.j2 @@ -1,6 +1,6 @@ #!/bin/bash -# This file is managed remotely, all changes will be lost +# {{ ansible_managed }} # This script should be executed from cron with a parameter, for example: # @hourly root rsnapshot-cron-wrapper hourly