From 4274194b9554d1a930adcd94db091fc00a930438 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 19 Feb 2019 11:10:05 +0100 Subject: [PATCH] Use ansible_managed tag --- roles/baseconfig/templates/apt/sources.list.j2 | 3 +-- roles/codimd/templates/apt/nodejs.j2 | 3 +-- roles/codimd/templates/systemd/codimd.service.j2 | 3 +-- roles/debian-backports/templates/backports.list.j2 | 3 +-- roles/dokuwiki/templates/apt/buster.list.j2 | 3 +-- roles/dokuwiki/templates/apt/dokuwiki.j2 | 3 +-- roles/etherpad/templates/apt/nodejs.j2 | 3 +-- roles/etherpad/templates/systemd/etherpad-lite.service.j2 | 3 +-- roles/ldap-client/templates/chsh.j2 | 1 + roles/ldap-client/templates/nslcd.conf.j2 | 3 +-- roles/ldap-client/templates/passwd.j2 | 1 + roles/ldap-replica/templates/schema.ldiff.j2 | 3 +-- roles/matrix-riot/templates/nginx-riot.j2 | 4 ++-- roles/nginx-reverse-proxy/templates/nginx-sites-available.j2 | 2 ++ 14 files changed, 16 insertions(+), 22 deletions(-) diff --git a/roles/baseconfig/templates/apt/sources.list.j2 b/roles/baseconfig/templates/apt/sources.list.j2 index edd810b..50bdcbd 100644 --- a/roles/baseconfig/templates/apt/sources.list.j2 +++ b/roles/baseconfig/templates/apt/sources.list.j2 @@ -1,5 +1,4 @@ -# /etc/apt/sources.list -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} {# #} {# Default mirror #} {% if debian_mirror is not defined %} diff --git a/roles/codimd/templates/apt/nodejs.j2 b/roles/codimd/templates/apt/nodejs.j2 index cd89d4c..aa74cfb 100644 --- a/roles/codimd/templates/apt/nodejs.j2 +++ b/roles/codimd/templates/apt/nodejs.j2 @@ -1,5 +1,4 @@ -# /etc/apt/preferences.d/dokuwiki -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} Package: node* libuv1* Pin: release a=stretch-backports diff --git a/roles/codimd/templates/systemd/codimd.service.j2 b/roles/codimd/templates/systemd/codimd.service.j2 index 4fcf211..78c74b6 100644 --- a/roles/codimd/templates/systemd/codimd.service.j2 +++ b/roles/codimd/templates/systemd/codimd.service.j2 @@ -1,5 +1,4 @@ -# /etc/systemd/system/codimd.service -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} [Unit] Description=CodiMD diff --git a/roles/debian-backports/templates/backports.list.j2 b/roles/debian-backports/templates/backports.list.j2 index f4ff812..aa9baa8 100644 --- a/roles/debian-backports/templates/backports.list.j2 +++ b/roles/debian-backports/templates/backports.list.j2 @@ -1,5 +1,4 @@ -# /etc/apt/sources.list.d/backports.list -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} {# #} {# Default mirror #} {% if debian_mirror is not defined %} diff --git a/roles/dokuwiki/templates/apt/buster.list.j2 b/roles/dokuwiki/templates/apt/buster.list.j2 index e03eb9f..5fada16 100644 --- a/roles/dokuwiki/templates/apt/buster.list.j2 +++ b/roles/dokuwiki/templates/apt/buster.list.j2 @@ -1,5 +1,4 @@ -# /etc/apt/sources.list.d/buster.list -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} {# #} {# Default mirror #} {% if debian_mirror is not defined %} diff --git a/roles/dokuwiki/templates/apt/dokuwiki.j2 b/roles/dokuwiki/templates/apt/dokuwiki.j2 index a9a2717..cc2d1a2 100644 --- a/roles/dokuwiki/templates/apt/dokuwiki.j2 +++ b/roles/dokuwiki/templates/apt/dokuwiki.j2 @@ -1,5 +1,4 @@ -# /etc/apt/preferences.d/dokuwiki -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} Package: * Pin: release n=stretch* diff --git a/roles/etherpad/templates/apt/nodejs.j2 b/roles/etherpad/templates/apt/nodejs.j2 index cd89d4c..aa74cfb 100644 --- a/roles/etherpad/templates/apt/nodejs.j2 +++ b/roles/etherpad/templates/apt/nodejs.j2 @@ -1,5 +1,4 @@ -# /etc/apt/preferences.d/dokuwiki -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} Package: node* libuv1* Pin: release a=stretch-backports diff --git a/roles/etherpad/templates/systemd/etherpad-lite.service.j2 b/roles/etherpad/templates/systemd/etherpad-lite.service.j2 index a34bf4a..13a97ce 100644 --- a/roles/etherpad/templates/systemd/etherpad-lite.service.j2 +++ b/roles/etherpad/templates/systemd/etherpad-lite.service.j2 @@ -1,5 +1,4 @@ -# /etc/systemd/system/etherpad-lite.service -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} [Unit] Description=Etherpad-lite, the collaborative editor. diff --git a/roles/ldap-client/templates/chsh.j2 b/roles/ldap-client/templates/chsh.j2 index fe3e2d2..8302af3 100644 --- a/roles/ldap-client/templates/chsh.j2 +++ b/roles/ldap-client/templates/chsh.j2 @@ -1,3 +1,4 @@ #!/bin/sh +# {{ ansible_managed }} echo "Pour changer votre shell,\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 fd152ed..db05bdc 100644 --- a/roles/ldap-client/templates/nslcd.conf.j2 +++ b/roles/ldap-client/templates/nslcd.conf.j2 @@ -1,5 +1,4 @@ -# /etc/nslcd.conf -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} # The user and group nslcd should run as. uid nslcd diff --git a/roles/ldap-client/templates/passwd.j2 b/roles/ldap-client/templates/passwd.j2 index c523e09..e7ea434 100644 --- a/roles/ldap-client/templates/passwd.j2 +++ b/roles/ldap-client/templates/passwd.j2 @@ -1,3 +1,4 @@ #!/bin/sh +# {{ ansible_managed }} echo "Pour changer votre mot de passe,\nAllez sur l'intranet : {{intranet_url}}" diff --git a/roles/ldap-replica/templates/schema.ldiff.j2 b/roles/ldap-replica/templates/schema.ldiff.j2 index 84f4281..83d716c 100644 --- a/roles/ldap-replica/templates/schema.ldiff.j2 +++ b/roles/ldap-replica/templates/schema.ldiff.j2 @@ -1,5 +1,4 @@ -# /etc/ldap/schema.ldiff -# Deployed with Aurore Ansible ! +# {{ ansible_managed }} dn: cn=config objectClass: olcGlobal diff --git a/roles/matrix-riot/templates/nginx-riot.j2 b/roles/matrix-riot/templates/nginx-riot.j2 index 9518145..c5d128c 100644 --- a/roles/matrix-riot/templates/nginx-riot.j2 +++ b/roles/matrix-riot/templates/nginx-riot.j2 @@ -1,5 +1,5 @@ -# /etc/nginx/sites-available/riot -# Ce fichier est géré par ansible +# {{ ansible_managed }} + server { listen 80; listen [::]:80; diff --git a/roles/nginx-reverse-proxy/templates/nginx-sites-available.j2 b/roles/nginx-reverse-proxy/templates/nginx-sites-available.j2 index adbdcc3..04ee932 100644 --- a/roles/nginx-reverse-proxy/templates/nginx-sites-available.j2 +++ b/roles/nginx-reverse-proxy/templates/nginx-sites-available.j2 @@ -1,3 +1,5 @@ +# {{ ansible_managed }} + server { server_name {{ item.from }}; include "snippets/proxy-common.conf";