From bbab45ae6f4393363f1553fb55eb5c48c827f458 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Thu, 10 Jan 2019 12:50:54 +0200 Subject: [PATCH] Adjust ansible_managed to use comment filter We don't need to comment the ansible_managed block manually. --- roles/mariadb/templates/mariadb.list.j2 | 2 +- roles/mariadb/templates/my.cnf.j2 | 2 +- roles/nginx/templates/blank-vhost.conf.j2 | 2 +- roles/nginx/templates/nginx_org_sources.list.j2 | 2 +- roles/nginx/templates/vhost.conf.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2 index 3ed9a58..c9efc0a 100644 --- a/roles/mariadb/templates/mariadb.list.j2 +++ b/roles/mariadb/templates/mariadb.list.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} {% if ansible_distribution == 'Ubuntu' %} deb [arch=amd64] http://mirror.23media.de/mariadb/repo/10.3/ubuntu {{ ansible_distribution_release }} main diff --git a/roles/mariadb/templates/my.cnf.j2 b/roles/mariadb/templates/my.cnf.j2 index 312d2e8..675e248 100644 --- a/roles/mariadb/templates/my.cnf.j2 +++ b/roles/mariadb/templates/my.cnf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # MariaDB database server configuration file. # diff --git a/roles/nginx/templates/blank-vhost.conf.j2 b/roles/nginx/templates/blank-vhost.conf.j2 index 64a2fca..d2574ea 100644 --- a/roles/nginx/templates/blank-vhost.conf.j2 +++ b/roles/nginx/templates/blank-vhost.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # default blank vhost # diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2 index 906cafb..67e6f26 100644 --- a/roles/nginx/templates/nginx_org_sources.list.j2 +++ b/roles/nginx/templates/nginx_org_sources.list.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} {% if ansible_distribution == 'Ubuntu' %} {% if nginx_version == "stable" %} diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2 index f7cc107..af7fb52 100644 --- a/roles/nginx/templates/vhost.conf.j2 +++ b/roles/nginx/templates/vhost.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} {# helper variables and per-site defaults that we can't set in role defaults #} {% set domain_name = item.domain_name %}