From 2a6c005190cbb335aafa45de8687f39b7aacf6c1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 3 Nov 2020 23:19:19 +0100 Subject: [PATCH] Replace ansible_header by ansible_managed --- roles/certbot/templates/letsencrypt/conf.d/certname.ini.j2 | 2 +- roles/certbot/templates/letsencrypt/rfc2136.ini.j2 | 2 +- .../templates/nginx/sites-available/redirect.j2 | 2 +- .../templates/nginx/sites-available/reverseproxy.j2 | 2 +- .../nginx/sites-available/reverseproxy_redirect_dname.j2 | 2 +- .../templates/nginx/snippets/options-proxypass.conf.j2 | 2 +- .../templates/nginx/snippets/options-ssl.conf.j2 | 2 +- roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/certbot/templates/letsencrypt/conf.d/certname.ini.j2 b/roles/certbot/templates/letsencrypt/conf.d/certname.ini.j2 index 837a60a..b063634 100644 --- a/roles/certbot/templates/letsencrypt/conf.d/certname.ini.j2 +++ b/roles/certbot/templates/letsencrypt/conf.d/certname.ini.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment(decoration='# ') }} +# {{ ansible_managed }} # Pour appliquer cette conf et générer la conf de renewal : # certbot --config wildcard.ini certonly diff --git a/roles/certbot/templates/letsencrypt/rfc2136.ini.j2 b/roles/certbot/templates/letsencrypt/rfc2136.ini.j2 index a41a547..342195d 100644 --- a/roles/certbot/templates/letsencrypt/rfc2136.ini.j2 +++ b/roles/certbot/templates/letsencrypt/rfc2136.ini.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment(decoration='# ') }} +# {{ ansible_managed }} dns_rfc2136_server = {{ dns_masters_ipv4 | first }} dns_rfc2136_port = 53 diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 b/roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 index 9cdb545..28e9b7d 100644 --- a/roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 +++ b/roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment }} +# {{ ansible_managed }} {% for site in nginx.redirect_sites %} # Redirect http://{{ site.from }} to http://{{ site.to }} diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 b/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 index 0898da0..d29d13c 100644 --- a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 +++ b/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment }} +# {{ ansible_managed }} # Automatic Connection header for WebSocket support # See http://nginx.org/en/docs/http/websocket.html diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 b/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 index 988b6d1..bac615d 100644 --- a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 +++ b/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment }} +# {{ ansible_managed }} {% for dname in nginx.redirect_dnames %} {% for site in nginx.reverseproxy_sites %} diff --git a/roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 b/roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 index 0b864a6..9515d81 100644 --- a/roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 +++ b/roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment }} +# {{ ansible_managed }} proxy_redirect off; proxy_set_header Host $host; diff --git a/roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 b/roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 index 1a9273a..fee51c6 100644 --- a/roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 +++ b/roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_header | comment }} +# {{ ansible_managed }} ssl_certificate {{ nginx.ssl.cert }}; ssl_certificate_key {{ nginx.ssl.cert_key }}; diff --git a/roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 b/roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 index 82373d0..fd749ad 100755 --- a/roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 +++ b/roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 @@ -1,3 +1,3 @@ #!/usr/bin/tail +14 -{{ ansible_header | comment }} +{{ ansible_managed }} > NGINX a été déployé sur cette machine. Voir /etc/nginx/.