From 4af63a2be577f82d14ac605b2f940b4ae0ab8e9b Mon Sep 17 00:00:00 2001
From: Bombar Maxime <bombar@crans.org>
Date: Thu, 16 Apr 2020 17:56:54 +0200
Subject: [PATCH] New ansible_header, more specific. See
 group_vars/all/vars.yaml

---
 ansible.cfg                                              | 2 +-
 group_vars/all/vars.yaml                                 | 9 +++++++++
 roles/ansible/templates/update-motd.d/05-service.j2      | 2 +-
 roles/bind-authoritative/templates/bind/named.conf.local | 2 +-
 roles/common-tools/templates/tmpfiles.d/screen.conf.j2   | 2 +-
 roles/debian-apt-sources/templates/apt/sources.list.j2   | 2 +-
 roles/django-cas/templates/cron.d/cas.j2                 | 2 +-
 roles/django-cas/templates/update-motd.d/05-service.j2   | 2 +-
 roles/framadate/templates/update-motd.d/05-service.j2    | 2 +-
 roles/ftpsync/templates/ftpsync-cron.j2                  | 2 +-
 roles/ftpsync/templates/ftpsync.conf.j2                  | 2 +-
 roles/ftpsync/templates/update-motd.d/05-service.j2      | 2 +-
 roles/grafana/templates/ldap.toml.j2                     | 2 +-
 roles/grafana/templates/update-motd.d/05-service.j2      | 2 +-
 .../templates/systemd/system/home.mount.j2               | 2 +-
 roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2       | 2 +-
 roles/keepalived/templates/keepalived/keepalived.conf.j2 | 2 +-
 roles/ldap-client/templates/bin/passwd.j2                | 2 +-
 roles/ldap-client/templates/nslcd.conf.j2                | 2 +-
 roles/local-facts/templates/facts.d/hash.fact.j2         | 2 +-
 roles/logall/templates/logrotate.d/firewall.j2           | 2 +-
 roles/logall/templates/rsyslog.d/10-firewall.conf.j2     | 2 +-
 roles/mtail/templates/default/mtail.j2                   | 2 +-
 roles/mtail/templates/mtail/dhcpd.mtail.j2               | 2 +-
 roles/mtail/templates/update-motd.d/05-service.j2        | 2 +-
 roles/mumudvb/templates/default/mumudvb.j2               | 2 +-
 .../templates/auto.master.d/home-adh.autofs.j2           | 2 +-
 roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2  | 2 +-
 roles/nfs-autofs/templates/auto.master.j2                | 2 +-
 roles/nfs-autofs/templates/default/autofs.j2             | 2 +-
 roles/nfs-common/templates/nfs-common.j2                 | 2 +-
 roles/nginx-pubftp/templates/nginx/ftp.j2                | 2 +-
 roles/nginx-pubftp/templates/update-motd.d/05-service.j2 | 2 +-
 .../templates/systemd/system/ninjabot-webhook.service.j2 | 2 +-
 .../templates/systemd/system/ninjabot.service.j2         | 2 +-
 roles/ninjabot/templates/update-motd.d/05-service.j2     | 2 +-
 roles/ntp-client/templates/ntp.conf.j2                   | 2 +-
 .../templates/auto.master.d/home-owncloud.autofs.j2      | 2 +-
 .../templates/auto.master.d/home-owncloud.sh.j2          | 2 +-
 roles/owncloud-autofs/templates/auto.master.j2           | 2 +-
 .../templates/cron.d/owncloud-clean-autofs.j2            | 2 +-
 roles/owncloud-autofs/templates/default/autofs.j2        | 2 +-
 roles/owncloud/templates/cron.d/owncloud.j2              | 2 +-
 roles/owncloud/templates/nginx/owncloud.j2               | 2 +-
 roles/owncloud/templates/update-motd.d/05-service.j2     | 2 +-
 roles/postfix/templates/postfix/canonical.j2             | 2 +-
 roles/postfix/templates/postfix/main.cf.j2               | 2 +-
 roles/postfix/templates/postfix/master.cf.j2             | 2 +-
 roles/postfix/templates/postfix/mime_header_checks.j2    | 2 +-
 .../postfix/templates/postfix/postscreen_access.cidr.j2  | 2 +-
 roles/postfix/templates/postfix/transport.j2             | 2 +-
 .../templates/prometheus/alertmanager.yml.j2             | 2 +-
 .../templates/prometheus/snmp.yml.j2                     | 2 +-
 roles/prometheus/templates/prometheus/alert.rules.yml.j2 | 2 +-
 .../prometheus/templates/prometheus/django.rules.yml.j2  | 2 +-
 roles/prometheus/templates/prometheus/prometheus.yml.j2  | 2 +-
 roles/prometheus/templates/update-motd.d/05-service.j2   | 2 +-
 roles/quagga-ipv4/templates/quagga/bgpd.conf.j2          | 2 +-
 roles/quagga-ipv4/templates/quagga/zebra.conf.j2         | 2 +-
 roles/quagga-ipv6/templates/quagga/bgpd.conf.j2          | 2 +-
 roles/quagga-ipv6/templates/quagga/zebra.conf.j2         | 2 +-
 roles/quagga/templates/quagga/daemons.j2                 | 2 +-
 roles/quagga/templates/quagga/debian.conf.j2             | 2 +-
 roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2   | 2 +-
 roles/re2o-dns/templates/cron.d/re2o-services-dns.j2     | 2 +-
 .../re2o-services/firewall/firewall_config.py.j2         | 2 +-
 .../re2o-services/firewall/firewall_config.py.j2         | 2 +-
 .../re2o-services/firewall/firewall_config.py.j2         | 2 +-
 .../re2o-services/firewall/firewall_config.py.j2         | 2 +-
 .../re2o-services/firewall/firewall_config.py.j2         | 2 +-
 .../templates/cron.d/re2o-services-firewall.j2           | 2 +-
 roles/re2o-home/templates/cron.d/re2o-services-home.j2   | 2 +-
 .../templates/cron.d/re2o-services-mail-server.j2        | 2 +-
 .../templates/cron.d/re2o-services-notif-users.j2        | 2 +-
 .../re2o-services/templates/re2o-services/config.ini.j2  | 2 +-
 roles/re2o/templates/re2o/settings_local.py.j2           | 2 +-
 roles/re2o/templates/update-motd.d/05-service.j2         | 2 +-
 roles/rsync-client/templates/rsyncd.conf.j2              | 2 +-
 roles/rsync-mirror/templates/rsync-mirror-cron.j2        | 2 +-
 roles/rsync-mirror/templates/update-motd.d/05-service.j2 | 2 +-
 .../templates/rsyslog.d/50-send_relp.conf.j2             | 2 +-
 roles/sudo/templates/sudoers.d/custom_passprompt.j2      | 2 +-
 roles/sudo/templates/sudoers.d/group_privilege.j2        | 2 +-
 roles/sudo/templates/sudoers.j2                          | 2 +-
 .../templates/update-motd.d/05-service.j2                | 2 +-
 .../templates/apt/preferences.d/limit-unstable.j2        | 2 +-
 roles/wireguard/templates/update-motd.d/05-service.j2    | 2 +-
 roles/wireguard/templates/wireguard/sputnik.conf.j2      | 2 +-
 roles/zbee-mount/templates/systemd/system/home.mount.j2  | 2 +-
 89 files changed, 97 insertions(+), 88 deletions(-)
 create mode 100644 group_vars/all/vars.yaml

diff --git a/ansible.cfg b/ansible.cfg
index c8a3365a..dfc04672 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -10,7 +10,7 @@ retry_files_enabled = False
 inventory = ./hosts
 
 # Custom header in templates
-ansible_managed = Ansible managed, see https://gitlab.crans.org/nounous/ansible
+# ansible_managed = Ansible managed, see https://gitlab.crans.org/nounous/ansible
 
 # Do not use cows (with cowsay)
 nocows = 1
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
new file mode 100644
index 00000000..8a6a9810
--- /dev/null
+++ b/group_vars/all/vars.yaml
@@ -0,0 +1,9 @@
+dirty: "{{lookup('pipe', 'git diff --quiet || echo dirty')}}"
+ansible_header: |
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
+       Ansible managed, don't modify the file locally.
+       See https://gitlab.crans.org/nounous/ansible.
+       Run by: {{ ansible_env.SUDO_USER }}
+       Latest commit: {% if dirty %}({{dirty}}) {% endif %}{{ lookup('pipe', 'git rev-parse HEAD') }}
+       {% set _, rpath = template_path.split('roles/') %}Template: roles/{{ rpath }}
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/roles/ansible/templates/update-motd.d/05-service.j2 b/roles/ansible/templates/update-motd.d/05-service.j2
index 9deed1ff..15419974 100755
--- a/roles/ansible/templates/update-motd.d/05-service.j2
+++ b/roles/ansible/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Ansible a été déployé sur cette machine. Voir /var/local/ansible/.
diff --git a/roles/bind-authoritative/templates/bind/named.conf.local b/roles/bind-authoritative/templates/bind/named.conf.local
index d1ef11fe..e9995b00 100644
--- a/roles/bind-authoritative/templates/bind/named.conf.local
+++ b/roles/bind-authoritative/templates/bind/named.conf.local
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 {% if not bind.master %}
 {% for zone in bind.zones %}
diff --git a/roles/common-tools/templates/tmpfiles.d/screen.conf.j2 b/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
index 7e6ea993..a85e4b02 100644
--- a/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
+++ b/roles/common-tools/templates/tmpfiles.d/screen.conf.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 d /var/run/screen 0755 root utmp
diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2
index 361a5d1d..25bf6387 100644
--- a/roles/debian-apt-sources/templates/apt/sources.list.j2
+++ b/roles/debian-apt-sources/templates/apt/sources.list.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # Mises à jour de sécurité
 deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates {{ debian_components }}
diff --git a/roles/django-cas/templates/cron.d/cas.j2 b/roles/django-cas/templates/cron.d/cas.j2
index 61da256d..ec29265e 100644
--- a/roles/django-cas/templates/cron.d/cas.j2
+++ b/roles/django-cas/templates/cron.d/cas.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 0   0  * * * www-data /usr/local/django/cas/manage.py clearsessions
 */5 *  * * * www-data /usr/local/django/cas/manage.py cas_clean_tickets
 5   0  * * * www-data /usr/local/django/cas/manage.py cas_clean_sessions
diff --git a/roles/django-cas/templates/update-motd.d/05-service.j2 b/roles/django-cas/templates/update-motd.d/05-service.j2
index 7f155732..7960a72b 100755
--- a/roles/django-cas/templates/update-motd.d/05-service.j2
+++ b/roles/django-cas/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > django-cas-server a été déployé sur cette machine. Voir /usr/local/django/cas.
diff --git a/roles/framadate/templates/update-motd.d/05-service.j2 b/roles/framadate/templates/update-motd.d/05-service.j2
index 6308fc0d..5cf07002 100755
--- a/roles/framadate/templates/update-motd.d/05-service.j2
+++ b/roles/framadate/templates/update-motd.d/05-service.j2
@@ -1,4 +1,4 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > framadate a été déployé sur cette machine.
   Voir {{ framadate_path }}
diff --git a/roles/ftpsync/templates/ftpsync-cron.j2 b/roles/ftpsync/templates/ftpsync-cron.j2
index 81f1a9aa..d4639dc0 100644
--- a/roles/ftpsync/templates/ftpsync-cron.j2
+++ b/roles/ftpsync/templates/ftpsync-cron.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% for i in ftpsync %}
 {{ i.cron_time }}  * * *   mirror ftpsync sync:archive:{{ i.name }}
 {% endfor %}
diff --git a/roles/ftpsync/templates/ftpsync.conf.j2 b/roles/ftpsync/templates/ftpsync.conf.j2
index a4178b35..f2045da5 100644
--- a/roles/ftpsync/templates/ftpsync.conf.j2
+++ b/roles/ftpsync/templates/ftpsync.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 MIRRORNAME="CRANS"
 TO="{{ item.dest }}"
diff --git a/roles/ftpsync/templates/update-motd.d/05-service.j2 b/roles/ftpsync/templates/update-motd.d/05-service.j2
index 7b05fcd2..be2b6cb5 100755
--- a/roles/ftpsync/templates/update-motd.d/05-service.j2
+++ b/roles/ftpsync/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > ftpsync a été déployé sur cette machine. Voir /etc/ftpsync/.
diff --git a/roles/grafana/templates/ldap.toml.j2 b/roles/grafana/templates/ldap.toml.j2
index f1f6c0c6..8fee2473 100644
--- a/roles/grafana/templates/ldap.toml.j2
+++ b/roles/grafana/templates/ldap.toml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # To troubleshoot and get more log info enable ldap debug logging in grafana.ini
 # [log]
 # filters = ldap:debug
diff --git a/roles/grafana/templates/update-motd.d/05-service.j2 b/roles/grafana/templates/update-motd.d/05-service.j2
index 19a693af..c85963d9 100755
--- a/roles/grafana/templates/update-motd.d/05-service.j2
+++ b/roles/grafana/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > grafana a été déployé sur cette machine. Voir /etc/grafana/.
diff --git a/roles/home-permanent/templates/systemd/system/home.mount.j2 b/roles/home-permanent/templates/systemd/system/home.mount.j2
index a5d29ce9..f5450959 100644
--- a/roles/home-permanent/templates/systemd/system/home.mount.j2
+++ b/roles/home-permanent/templates/systemd/system/home.mount.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=Mount home-adh on zbee
 Wants=network-online.target
diff --git a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
index 6b6fe6cc..8be15508 100644
--- a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
+++ b/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2
@@ -1,5 +1,5 @@
 # dhcpd.conf
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # option definitions common to all supported networks...
 #option domain-name "example.org";
diff --git a/roles/keepalived/templates/keepalived/keepalived.conf.j2 b/roles/keepalived/templates/keepalived/keepalived.conf.j2
index fc2e1578..219d6b4f 100644
--- a/roles/keepalived/templates/keepalived/keepalived.conf.j2
+++ b/roles/keepalived/templates/keepalived/keepalived.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 global_defs {
   notification_email {
diff --git a/roles/ldap-client/templates/bin/passwd.j2 b/roles/ldap-client/templates/bin/passwd.j2
index d7ce14d7..40b04126 100644
--- a/roles/ldap-client/templates/bin/passwd.j2
+++ b/roles/ldap-client/templates/bin/passwd.j2
@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 echo "Pour changer votre mot de passe,\nAllez sur l'intranet : {{intranet_url}}"
diff --git a/roles/ldap-client/templates/nslcd.conf.j2 b/roles/ldap-client/templates/nslcd.conf.j2
index 594a6384..e634dd23 100644
--- a/roles/ldap-client/templates/nslcd.conf.j2
+++ b/roles/ldap-client/templates/nslcd.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # The user and group nslcd should run as.
 uid nslcd
diff --git a/roles/local-facts/templates/facts.d/hash.fact.j2 b/roles/local-facts/templates/facts.d/hash.fact.j2
index ee5df325..5c221c08 100755
--- a/roles/local-facts/templates/facts.d/hash.fact.j2
+++ b/roles/local-facts/templates/facts.d/hash.fact.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 [commit]
 latest_commit_hash: {{ git_version.stdout }}
diff --git a/roles/logall/templates/logrotate.d/firewall.j2 b/roles/logall/templates/logrotate.d/firewall.j2
index 550e85ab..08678118 100644
--- a/roles/logall/templates/logrotate.d/firewall.j2
+++ b/roles/logall/templates/logrotate.d/firewall.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 /var/log/firewall/trace.log
 /var/log/firewall/filtre.log
diff --git a/roles/logall/templates/rsyslog.d/10-firewall.conf.j2 b/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
index 94e23c4d..6faa5180 100644
--- a/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
+++ b/roles/logall/templates/rsyslog.d/10-firewall.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #$ModLoad imklog #Déjà présent dans rsyslog.conf
 
 # Messages du firewall (ie de sa génération)
diff --git a/roles/mtail/templates/default/mtail.j2 b/roles/mtail/templates/default/mtail.j2
index bb782a3f..94bbac1a 100644
--- a/roles/mtail/templates/default/mtail.j2
+++ b/roles/mtail/templates/default/mtail.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Set to 1 to start Mtail at boot.
 ENABLED=1
 
diff --git a/roles/mtail/templates/mtail/dhcpd.mtail.j2 b/roles/mtail/templates/mtail/dhcpd.mtail.j2
index c612a404..b3f8629b 100644
--- a/roles/mtail/templates/mtail/dhcpd.mtail.j2
+++ b/roles/mtail/templates/mtail/dhcpd.mtail.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Copyright 2011 Google Inc. All Rights Reserved.
 # This file is available under the Apache license.
 
diff --git a/roles/mtail/templates/update-motd.d/05-service.j2 b/roles/mtail/templates/update-motd.d/05-service.j2
index 74dc66f5..8e63351f 100755
--- a/roles/mtail/templates/update-motd.d/05-service.j2
+++ b/roles/mtail/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > mtail a été déployé sur cette machine. Voir /etc/mtail/.
diff --git a/roles/mumudvb/templates/default/mumudvb.j2 b/roles/mumudvb/templates/default/mumudvb.j2
index 3638e0d3..4df46abe 100644
--- a/roles/mumudvb/templates/default/mumudvb.j2
+++ b/roles/mumudvb/templates/default/mumudvb.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #Mumudvb init config file
 #
 # This file is used to specify the locations of mumudvb config files for each card
diff --git a/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2 b/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
index ec7f3673..037f5e2a 100644
--- a/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
+++ b/roles/nfs-autofs/templates/auto.master.d/home-adh.autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 /home /etc/auto.master.d/home-adh.sh -t600
diff --git a/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2 b/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
index 1757c7d9..ea85a234 100755
--- a/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
+++ b/roles/nfs-autofs/templates/auto.master.d/home-adh.sh.j2
@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 exec echo "-fstype=nfs,nosuid nfs.adm.crans.org:/home-adh/$1"
diff --git a/roles/nfs-autofs/templates/auto.master.j2 b/roles/nfs-autofs/templates/auto.master.j2
index 4ff2d9dd..1502faeb 100644
--- a/roles/nfs-autofs/templates/auto.master.j2
+++ b/roles/nfs-autofs/templates/auto.master.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # Sample auto.master file
 # This is a 'master' automounter map and it has the following format:
diff --git a/roles/nfs-autofs/templates/default/autofs.j2 b/roles/nfs-autofs/templates/default/autofs.j2
index 4c28d404..dda3c1fe 100644
--- a/roles/nfs-autofs/templates/default/autofs.j2
+++ b/roles/nfs-autofs/templates/default/autofs.j2
@@ -1,6 +1,6 @@
 #
 # Init system options
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # If the kernel supports using the autofs miscellanous device
 # and you wish to use it you must set this configuration option
diff --git a/roles/nfs-common/templates/nfs-common.j2 b/roles/nfs-common/templates/nfs-common.j2
index 84b23a68..ef51d4e7 100644
--- a/roles/nfs-common/templates/nfs-common.j2
+++ b/roles/nfs-common/templates/nfs-common.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # If you do not set values for the NEED_ options, they will be attempted
 # autodetected; this should be sufficient for most people. Valid alternatives
 # for the NEED_ options are "yes" and "no".
diff --git a/roles/nginx-pubftp/templates/nginx/ftp.j2 b/roles/nginx-pubftp/templates/nginx/ftp.j2
index 8e2e9839..7ebf0cf2 100644
--- a/roles/nginx-pubftp/templates/nginx/ftp.j2
+++ b/roles/nginx-pubftp/templates/nginx/ftp.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 server { 
     listen 80;
     listen [::]:80;
diff --git a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2 b/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
index 030f6f07..8f299dfa 100755
--- a/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
+++ b/roles/nginx-pubftp/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > NGINX a été déployé sur cette machine. Voir /etc/nginx/.
diff --git a/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2 b/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
index 363b7f26..3fbf9b82 100644
--- a/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
+++ b/roles/ninjabot/templates/systemd/system/ninjabot-webhook.service.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=NinjaBot WebHook server
 After=network.target ninjabot.service
diff --git a/roles/ninjabot/templates/systemd/system/ninjabot.service.j2 b/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
index e21cd1cc..4a9886ca 100644
--- a/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
+++ b/roles/ninjabot/templates/systemd/system/ninjabot.service.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=NinjaBot IRC bot
 After=network.target
diff --git a/roles/ninjabot/templates/update-motd.d/05-service.j2 b/roles/ninjabot/templates/update-motd.d/05-service.j2
index 0537f6a7..8dec761c 100755
--- a/roles/ninjabot/templates/update-motd.d/05-service.j2
+++ b/roles/ninjabot/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > NinjaBot a été déployé sur cette machine. Voir /var/local/ninjabot/.
diff --git a/roles/ntp-client/templates/ntp.conf.j2 b/roles/ntp-client/templates/ntp.conf.j2
index b65a209c..050f51c8 100644
--- a/roles/ntp-client/templates/ntp.conf.j2
+++ b/roles/ntp-client/templates/ntp.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
 
 driftfile /var/lib/ntp/ntp.drift
diff --git a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2 b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
index 62c3cb15..88def7c1 100644
--- a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
+++ b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 /home-owncloud /etc/auto.master.d/home-owncloud.sh -t60
diff --git a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2 b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
index eded801c..7a3ec28f 100755
--- a/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
+++ b/roles/owncloud-autofs/templates/auto.master.d/home-owncloud.sh.j2
@@ -1,5 +1,5 @@
 #!/bin/bash
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # Certains user dans owncloud ont été créés sous la forme user_1234 ce qui faisait planter le autofs
 # ceci est un fix
diff --git a/roles/owncloud-autofs/templates/auto.master.j2 b/roles/owncloud-autofs/templates/auto.master.j2
index 4ff2d9dd..1502faeb 100644
--- a/roles/owncloud-autofs/templates/auto.master.j2
+++ b/roles/owncloud-autofs/templates/auto.master.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # Sample auto.master file
 # This is a 'master' automounter map and it has the following format:
diff --git a/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2 b/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
index a525ac32..3d540c59 100644
--- a/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
+++ b/roles/owncloud-autofs/templates/cron.d/owncloud-clean-autofs.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */15 * * * * root /bin/ls -l /home-owncloud/ 2>/dev/null | /bin/grep d????????? | /usr/bin/awk '{print $7}' | /usr/bin/xargs -I '@LOGIN@' /bin/umount /home-owncloud/@LOGIN@
diff --git a/roles/owncloud-autofs/templates/default/autofs.j2 b/roles/owncloud-autofs/templates/default/autofs.j2
index 4c28d404..dda3c1fe 100644
--- a/roles/owncloud-autofs/templates/default/autofs.j2
+++ b/roles/owncloud-autofs/templates/default/autofs.j2
@@ -1,6 +1,6 @@
 #
 # Init system options
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # If the kernel supports using the autofs miscellanous device
 # and you wish to use it you must set this configuration option
diff --git a/roles/owncloud/templates/cron.d/owncloud.j2 b/roles/owncloud/templates/cron.d/owncloud.j2
index 5838070e..f3d6acd7 100644
--- a/roles/owncloud/templates/cron.d/owncloud.j2
+++ b/roles/owncloud/templates/cron.d/owncloud.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */15 * * * * www-data /usr/bin/php /var/www/owncloud/occ system:cron > /dev/null 2>&1
diff --git a/roles/owncloud/templates/nginx/owncloud.j2 b/roles/owncloud/templates/nginx/owncloud.j2
index cb19043d..79352bbf 100644
--- a/roles/owncloud/templates/nginx/owncloud.j2
+++ b/roles/owncloud/templates/nginx/owncloud.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 upstream php-handler {
     server unix:/var/run/php/php7.3-fpm.sock;
diff --git a/roles/owncloud/templates/update-motd.d/05-service.j2 b/roles/owncloud/templates/update-motd.d/05-service.j2
index e4043602..b46d3876 100755
--- a/roles/owncloud/templates/update-motd.d/05-service.j2
+++ b/roles/owncloud/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > OwnCloud a été déployé sur cette machine. Voir /var/www/owncloud/.
diff --git a/roles/postfix/templates/postfix/canonical.j2 b/roles/postfix/templates/postfix/canonical.j2
index c0cfd082..f852a13b 100644
--- a/roles/postfix/templates/postfix/canonical.j2
+++ b/roles/postfix/templates/postfix/canonical.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Fichier fournissant des méthodes pour traduire certaines adresses
 
 /^(.*)@localhost(\.crans\.org)?$/   ${1}@crans.org
diff --git a/roles/postfix/templates/postfix/main.cf.j2 b/roles/postfix/templates/postfix/main.cf.j2
index d4b299c4..239ccb5a 100644
--- a/roles/postfix/templates/postfix/main.cf.j2
+++ b/roles/postfix/templates/postfix/main.cf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Fichier de configuration principal de postfix.
 
 # +------------------+
diff --git a/roles/postfix/templates/postfix/master.cf.j2 b/roles/postfix/templates/postfix/master.cf.j2
index f979e4fa..40a696c4 100644
--- a/roles/postfix/templates/postfix/master.cf.j2
+++ b/roles/postfix/templates/postfix/master.cf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_header }}
 # Fichier de configuration des démons de postfix.
 
 # +------------------------+
diff --git a/roles/postfix/templates/postfix/mime_header_checks.j2 b/roles/postfix/templates/postfix/mime_header_checks.j2
index c5e47193..2195544e 100644
--- a/roles/postfix/templates/postfix/mime_header_checks.j2
+++ b/roles/postfix/templates/postfix/mime_header_checks.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Filtrage des fichiers envoyes en piece jointe.
 
 # La version hard (s'il n'y a pas d'antivirus, ou pour le dernier virus a la mode)
diff --git a/roles/postfix/templates/postfix/postscreen_access.cidr.j2 b/roles/postfix/templates/postfix/postscreen_access.cidr.j2
index 65a8c8c3..fb8869f5 100644
--- a/roles/postfix/templates/postfix/postscreen_access.cidr.j2
+++ b/roles/postfix/templates/postfix/postscreen_access.cidr.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 127.0.0.1                                 permit
 138.231.0.0/16                            permit
diff --git a/roles/postfix/templates/postfix/transport.j2 b/roles/postfix/templates/postfix/transport.j2
index 2e44b92a..77e92b2b 100644
--- a/roles/postfix/templates/postfix/transport.j2
+++ b/roles/postfix/templates/postfix/transport.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Transport des mails
 
 {% if postfix.mailman %}
diff --git a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
index bf4d26e0..28c27f27 100644
--- a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
+++ b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # See https://prometheus.io/docs/alerting/configuration/ for documentation.
 
 global:
diff --git a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2 b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
index 74f429c0..8748744f 100644
--- a/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
+++ b/roles/prometheus-snmp-exporter/templates/prometheus/snmp.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # TODOlist :
 # - Faire fonctionner le monitoring des switchs défini ici
 #   * Configurer tous les switchs avec un compte SNMPv3
diff --git a/roles/prometheus/templates/prometheus/alert.rules.yml.j2 b/roles/prometheus/templates/prometheus/alert.rules.yml.j2
index 32064d32..4443b364 100644
--- a/roles/prometheus/templates/prometheus/alert.rules.yml.j2
+++ b/roles/prometheus/templates/prometheus/alert.rules.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {# As this is also Jinja2 it will conflict without a raw block #}
 {# Depending of Prometheus Node exporter version, rules can change depending of version #}
 {% raw %}
diff --git a/roles/prometheus/templates/prometheus/django.rules.yml.j2 b/roles/prometheus/templates/prometheus/django.rules.yml.j2
index fddd3985..8131a71f 100644
--- a/roles/prometheus/templates/prometheus/django.rules.yml.j2
+++ b/roles/prometheus/templates/prometheus/django.rules.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {# As this is also Jinja2 it will conflict without a raw block #}
 {% raw %}
 groups:
diff --git a/roles/prometheus/templates/prometheus/prometheus.yml.j2 b/roles/prometheus/templates/prometheus/prometheus.yml.j2
index 8dc04497..4d184080 100644
--- a/roles/prometheus/templates/prometheus/prometheus.yml.j2
+++ b/roles/prometheus/templates/prometheus/prometheus.yml.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 global:
   # scrape_interval is set to the global default (60s)
diff --git a/roles/prometheus/templates/update-motd.d/05-service.j2 b/roles/prometheus/templates/update-motd.d/05-service.j2
index af9dab74..71600065 100755
--- a/roles/prometheus/templates/update-motd.d/05-service.j2
+++ b/roles/prometheus/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > prometheus a été déployé sur cette machine. Voir /etc/prometheus/.
diff --git a/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2 b/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
index 8ffb2198..f3829097 100644
--- a/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
+++ b/roles/quagga-ipv4/templates/quagga/bgpd.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 router bgp {{ bgp.as }}
 no synchronization
diff --git a/roles/quagga-ipv4/templates/quagga/zebra.conf.j2 b/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
index 3c767212..4f3b6367 100644
--- a/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
+++ b/roles/quagga-ipv4/templates/quagga/zebra.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 hostname zebra
 password {{ zebra.password }}
diff --git a/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2 b/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
index 3c472a85..2fe4a763 100644
--- a/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
+++ b/roles/quagga-ipv6/templates/quagga/bgpd.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 router bgp {{ bgp.as }}
 no synchronization
diff --git a/roles/quagga-ipv6/templates/quagga/zebra.conf.j2 b/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
index b4fe39e5..aa63898a 100644
--- a/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
+++ b/roles/quagga-ipv6/templates/quagga/zebra.conf.j2
@@ -1,4 +1,4 @@
-! {{ ansible_managed }}
+! {{ ansible_header | comment }}
 
 hostname zebra
 password {{ zebra.password }}
diff --git a/roles/quagga/templates/quagga/daemons.j2 b/roles/quagga/templates/quagga/daemons.j2
index 721ccc9e..2bc28883 100644
--- a/roles/quagga/templates/quagga/daemons.j2
+++ b/roles/quagga/templates/quagga/daemons.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 #   2 .. 10  = lower priorities
 # Read /usr/share/doc/quagga/README.Debian for details.
diff --git a/roles/quagga/templates/quagga/debian.conf.j2 b/roles/quagga/templates/quagga/debian.conf.j2
index 8f1f13fb..ac5f1703 100644
--- a/roles/quagga/templates/quagga/debian.conf.j2
+++ b/roles/quagga/templates/quagga/debian.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+# {{ ansible_header }}
 #
 # If this option is set the /etc/init.d/quagga script automatically loads
 # the config via "vtysh -b" when the servers are started.
diff --git a/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2 b/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
index fa341ae2..7632df1b 100644
--- a/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
+++ b/roles/re2o-dhcp/templates/cron.d/re2o-services-dhcp.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 * * * * * root /usr/bin/python3 /var/local/re2o-services/dhcp/main.py
diff --git a/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2 b/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
index 56324c22..ce93d943 100644
--- a/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
+++ b/roles/re2o-dns/templates/cron.d/re2o-services-dns.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/dns/main.py
diff --git a/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
index 9b0bf478..7c8cd0db 100644
--- a/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-gulp/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
index eddcf574..bba22b62 100644
--- a/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-ipv6-zayo/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
index 133b9ac6..3cf5f8a3 100644
--- a/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-odlyd/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
index 1b60c1cb..12dca11a 100644
--- a/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-routeur/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2 b/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
index 9cd2b9ed..17b601b3 100644
--- a/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
+++ b/roles/re2o-firewall-zamok/templates/re2o-services/firewall/firewall_config.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 ### Give me a role
 
diff --git a/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2 b/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
index 2565d92e..e81d4775 100644
--- a/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
+++ b/roles/re2o-firewall/templates/cron.d/re2o-services-firewall.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/firewall/main.py
 @reboot root /usr/bin/python3 /var/local/re2o-services/firewall/main.py --force
diff --git a/roles/re2o-home/templates/cron.d/re2o-services-home.j2 b/roles/re2o-home/templates/cron.d/re2o-services-home.j2
index a40a7669..ff3c262f 100644
--- a/roles/re2o-home/templates/cron.d/re2o-services-home.j2
+++ b/roles/re2o-home/templates/cron.d/re2o-services-home.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */2 * * * * root /usr/bin/python3 /var/local/re2o-services/home/main.py
diff --git a/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2 b/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
index c804b50a..579f720d 100644
--- a/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
+++ b/roles/re2o-mail-server/templates/cron.d/re2o-services-mail-server.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 */5 * * * * root /usr/bin/python3 /var/local/re2o-services/mail-server/main.py
diff --git a/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2 b/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
index 92aaf0a7..d82241ea 100644
--- a/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
+++ b/roles/re2o-notif-users/templates/cron.d/re2o-services-notif-users.j2
@@ -1,2 +1,2 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 @hourly root /usr/bin/python3 /var/local/re2o-services/notif-users/main.py
diff --git a/roles/re2o-services/templates/re2o-services/config.ini.j2 b/roles/re2o-services/templates/re2o-services/config.ini.j2
index 9ff151ca..8e464dfc 100644
--- a/roles/re2o-services/templates/re2o-services/config.ini.j2
+++ b/roles/re2o-services/templates/re2o-services/config.ini.j2
@@ -1,4 +1,4 @@
-; {{ ansible_managed }}
+; {{ ansible_header | comment }}
 [Re2o]
 hostname = {{ re2o.server }}
 username = {{ re2o.service_user }}
diff --git a/roles/re2o/templates/re2o/settings_local.py.j2 b/roles/re2o/templates/re2o/settings_local.py.j2
index 50857c86..a11c957f 100644
--- a/roles/re2o/templates/re2o/settings_local.py.j2
+++ b/roles/re2o/templates/re2o/settings_local.py.j2
@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 from __future__ import unicode_literals
 
diff --git a/roles/re2o/templates/update-motd.d/05-service.j2 b/roles/re2o/templates/update-motd.d/05-service.j2
index 3d29ee95..a3646eaf 100755
--- a/roles/re2o/templates/update-motd.d/05-service.j2
+++ b/roles/re2o/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Re2o a été déployé sur cette machine. Voir /var/www/re2o/.
diff --git a/roles/rsync-client/templates/rsyncd.conf.j2 b/roles/rsync-client/templates/rsyncd.conf.j2
index eab22931..d1236f07 100644
--- a/roles/rsync-client/templates/rsyncd.conf.j2
+++ b/roles/rsync-client/templates/rsyncd.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 # GLOBAL OPTIONS
 log file=/var/log/rsyncd
diff --git a/roles/rsync-mirror/templates/rsync-mirror-cron.j2 b/roles/rsync-mirror/templates/rsync-mirror-cron.j2
index 039b6422..cb98968f 100644
--- a/roles/rsync-mirror/templates/rsync-mirror-cron.j2
+++ b/roles/rsync-mirror/templates/rsync-mirror-cron.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% for i in rsync_mirror %}
 {{ i.cron_time }}  * * *   mirror rsync --times --links --hard-links --partial --block-size=8192 --recursive --exclude *-dvd-* --exclude source/ --verbose --stats --delete-after rsync://{{ i.rsync_host }}/{{ i.rsync_path }} {{ i.dest }} | tee -a "/var/log/mirror/{{ i.name }}.log" > /dev/null
 {% endfor %}
diff --git a/roles/rsync-mirror/templates/update-motd.d/05-service.j2 b/roles/rsync-mirror/templates/update-motd.d/05-service.j2
index 0f9abd08..1b32b9ec 100755
--- a/roles/rsync-mirror/templates/update-motd.d/05-service.j2
+++ b/roles/rsync-mirror/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > rsync-mirror a été déployé sur cette machine. Voir /etc/cron.d/rsync-mirror.
diff --git a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2 b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
index 3eedde5e..6a1bc009 100644
--- a/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
+++ b/roles/rsyslog-client/templates/rsyslog.d/50-send_relp.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 $ModLoad omrelp
 $WorkDirectory /var/log/spool  # default location for work (spool) files
 
diff --git a/roles/sudo/templates/sudoers.d/custom_passprompt.j2 b/roles/sudo/templates/sudoers.d/custom_passprompt.j2
index 27e69564..add19a4e 100644
--- a/roles/sudo/templates/sudoers.d/custom_passprompt.j2
+++ b/roles/sudo/templates/sudoers.d/custom_passprompt.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Change prompt
 Defaults        passprompt_override
 Defaults        passprompt="[sudo] mot de passe pour %p sur %h: "
diff --git a/roles/sudo/templates/sudoers.d/group_privilege.j2 b/roles/sudo/templates/sudoers.d/group_privilege.j2
index 0239609b..54f198cd 100644
--- a/roles/sudo/templates/sudoers.d/group_privilege.j2
+++ b/roles/sudo/templates/sudoers.d/group_privilege.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 # Group privilege specification
 %nounou    ALL=(ALL:ALL) ALL
diff --git a/roles/sudo/templates/sudoers.j2 b/roles/sudo/templates/sudoers.j2
index 9ad07f35..dbc086ba 100644
--- a/roles/sudo/templates/sudoers.j2
+++ b/roles/sudo/templates/sudoers.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 #
 # See the man page for details on how to write a sudoers file.
 #
diff --git a/roles/unifi-controller/templates/update-motd.d/05-service.j2 b/roles/unifi-controller/templates/update-motd.d/05-service.j2
index e3d89df2..59ce4a0e 100755
--- a/roles/unifi-controller/templates/update-motd.d/05-service.j2
+++ b/roles/unifi-controller/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > Le contrôleur Unifi a été déployé sur cette machine.
diff --git a/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2 b/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
index 5de43d80..4ffc0b66 100644
--- a/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
+++ b/roles/wireguard/templates/apt/preferences.d/limit-unstable.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 
 Package: *
 Pin: release a=unstable
diff --git a/roles/wireguard/templates/update-motd.d/05-service.j2 b/roles/wireguard/templates/update-motd.d/05-service.j2
index e0ab595f..b59ca12e 100755
--- a/roles/wireguard/templates/update-motd.d/05-service.j2
+++ b/roles/wireguard/templates/update-motd.d/05-service.j2
@@ -1,4 +1,4 @@
 #!/usr/bin/tail +3
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 > wireguard a été déployé sur cette machine.
   Voir /etc/wireguard/
diff --git a/roles/wireguard/templates/wireguard/sputnik.conf.j2 b/roles/wireguard/templates/wireguard/sputnik.conf.j2
index 2d657b47..71f4a1a3 100644
--- a/roles/wireguard/templates/wireguard/sputnik.conf.j2
+++ b/roles/wireguard/templates/wireguard/sputnik.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 {% if wireguard.sputnik %}
 [Interface]
 Address = 172.31.0.2/30, fd0c:700:0:8::2/64
diff --git a/roles/zbee-mount/templates/systemd/system/home.mount.j2 b/roles/zbee-mount/templates/systemd/system/home.mount.j2
index 65a1a795..27272946 100644
--- a/roles/zbee-mount/templates/systemd/system/home.mount.j2
+++ b/roles/zbee-mount/templates/systemd/system/home.mount.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 [Unit]
 Description=Mount /home-adh/{{ item }}
 After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-- 
GitLab