From fcb434e24895db61af9d154bc8944e90546056a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Sun, 4 Feb 2018 10:13:18 -0300 Subject: [PATCH] Added "Managed by Salt..." headers in template and made them unifom across the formula --- apache/files/Debian/apache-2.4.config.jinja | 4 +++- apache/files/Debian/envvars-2.2.jinja | 6 ++++-- apache/files/Debian/envvars-2.4.jinja | 6 ++++-- apache/files/Debian/mpm/mpm_event.conf.jinja | 5 +++-- apache/files/Debian/mpm/mpm_prefork.conf.jinja | 5 +++-- apache/files/Debian/mpm/mpm_worker.conf.jinja | 5 +++-- apache/files/Debian/ports-2.2.conf.jinja | 5 +++-- apache/files/Debian/ports-2.4.conf.jinja | 5 +++-- apache/files/FreeBSD/envvars-2.4.jinja | 4 +++- apache/files/FreeBSD/generic_module.conf.jinja | 4 +++- apache/files/FreeBSD/mod_ssl.conf.jinja | 4 +++- apache/files/FreeBSD/ports-2.4.conf.jinja | 5 +++-- apache/files/RedHat/apache-2.4.config.jinja | 5 +++-- apache/files/tls-defaults.conf.jinja | 5 +++-- apache/vhosts/minimal.tmpl | 3 +++ apache/vhosts/proxy.tmpl | 3 +++ apache/vhosts/redirect.tmpl | 3 +++ apache/vhosts/standard.tmpl | 3 +++ 18 files changed, 56 insertions(+), 24 deletions(-) diff --git a/apache/files/Debian/apache-2.4.config.jinja b/apache/files/Debian/apache-2.4.config.jinja index 53d1db4..7caa7b3 100644 --- a/apache/files/Debian/apache-2.4.config.jinja +++ b/apache/files/Debian/apache-2.4.config.jinja @@ -1,4 +1,6 @@ -# Managed by saltstack +# +# This file is managed by Salt! Do not edit by hand! +# # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. diff --git a/apache/files/Debian/envvars-2.2.jinja b/apache/files/Debian/envvars-2.2.jinja index a605012..cab5b51 100644 --- a/apache/files/Debian/envvars-2.2.jinja +++ b/apache/files/Debian/envvars-2.2.jinja @@ -1,5 +1,7 @@ -{%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack +# +# This file is managed by Salt! Do not edit by hand! +# +{% from "apache/map.jinja" import apache with context -%} # envvars - default environment variables for apache2ctl diff --git a/apache/files/Debian/envvars-2.4.jinja b/apache/files/Debian/envvars-2.4.jinja index 70a4523..debf3ff 100644 --- a/apache/files/Debian/envvars-2.4.jinja +++ b/apache/files/Debian/envvars-2.4.jinja @@ -1,5 +1,7 @@ -{%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack +# +# This file is managed by Salt! Do not edit by hand! +# +{% from "apache/map.jinja" import apache with context -%} # envvars - default environment variables for apache2ctl diff --git a/apache/files/Debian/mpm/mpm_event.conf.jinja b/apache/files/Debian/mpm/mpm_event.conf.jinja index cecb7ca..7efd5c8 100644 --- a/apache/files/Debian/mpm/mpm_event.conf.jinja +++ b/apache/files/Debian/mpm/mpm_event.conf.jinja @@ -1,5 +1,6 @@ -# Managed by saltstack - +# +# This file is managed by Salt! Do not edit by hand! +# {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %} # event MPM diff --git a/apache/files/Debian/mpm/mpm_prefork.conf.jinja b/apache/files/Debian/mpm/mpm_prefork.conf.jinja index 69f0be3..5b6eb81 100644 --- a/apache/files/Debian/mpm/mpm_prefork.conf.jinja +++ b/apache/files/Debian/mpm/mpm_prefork.conf.jinja @@ -1,5 +1,6 @@ -# Managed by saltstack - +# +# This file is managed by Salt! Do not edit by hand! +# {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %} # prefork MPM diff --git a/apache/files/Debian/mpm/mpm_worker.conf.jinja b/apache/files/Debian/mpm/mpm_worker.conf.jinja index d50cbcd..626f08a 100644 --- a/apache/files/Debian/mpm/mpm_worker.conf.jinja +++ b/apache/files/Debian/mpm/mpm_worker.conf.jinja @@ -1,5 +1,6 @@ -# Managed by saltstack - +# +# This file is managed by Salt! Do not edit by hand! +# {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %} # worker MPM diff --git a/apache/files/Debian/ports-2.2.conf.jinja b/apache/files/Debian/ports-2.2.conf.jinja index 128c87a..f9c7339 100644 --- a/apache/files/Debian/ports-2.2.conf.jinja +++ b/apache/files/Debian/ports-2.2.conf.jinja @@ -1,7 +1,8 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack - {% if salt['pillar.get']('apache:sites') is mapping %} {%- set listen_directives = [] %} {%- for id, site in salt['pillar.get']('apache:sites').items() %} diff --git a/apache/files/Debian/ports-2.4.conf.jinja b/apache/files/Debian/ports-2.4.conf.jinja index 128c87a..f9c7339 100644 --- a/apache/files/Debian/ports-2.4.conf.jinja +++ b/apache/files/Debian/ports-2.4.conf.jinja @@ -1,7 +1,8 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack - {% if salt['pillar.get']('apache:sites') is mapping %} {%- set listen_directives = [] %} {%- for id, site in salt['pillar.get']('apache:sites').items() %} diff --git a/apache/files/FreeBSD/envvars-2.4.jinja b/apache/files/FreeBSD/envvars-2.4.jinja index b0d27b9..d57bda3 100644 --- a/apache/files/FreeBSD/envvars-2.4.jinja +++ b/apache/files/FreeBSD/envvars-2.4.jinja @@ -1,5 +1,7 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack # envvars - default environment variables for apache2ctl diff --git a/apache/files/FreeBSD/generic_module.conf.jinja b/apache/files/FreeBSD/generic_module.conf.jinja index 8882b45..66f82ff 100644 --- a/apache/files/FreeBSD/generic_module.conf.jinja +++ b/apache/files/FreeBSD/generic_module.conf.jinja @@ -1,4 +1,6 @@ -# Managed by saltstack +# +# This file is managed by Salt! Do not edit by hand! +# LoadModule {{ module_name }}_module libexec/apache24/mod_{{ module_name }}.so diff --git a/apache/files/FreeBSD/mod_ssl.conf.jinja b/apache/files/FreeBSD/mod_ssl.conf.jinja index 3e76ea7..27ae9ec 100644 --- a/apache/files/FreeBSD/mod_ssl.conf.jinja +++ b/apache/files/FreeBSD/mod_ssl.conf.jinja @@ -1,4 +1,6 @@ -# Managed by saltstack +# +# This file is managed by Salt! Do not edit by hand! +# LoadModule ssl_module libexec/apache24/mod_ssl.so diff --git a/apache/files/FreeBSD/ports-2.4.conf.jinja b/apache/files/FreeBSD/ports-2.4.conf.jinja index 128c87a..f9c7339 100644 --- a/apache/files/FreeBSD/ports-2.4.conf.jinja +++ b/apache/files/FreeBSD/ports-2.4.conf.jinja @@ -1,7 +1,8 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {%- from "apache/map.jinja" import apache with context -%} -# Managed by saltstack - {% if salt['pillar.get']('apache:sites') is mapping %} {%- set listen_directives = [] %} {%- for id, site in salt['pillar.get']('apache:sites').items() %} diff --git a/apache/files/RedHat/apache-2.4.config.jinja b/apache/files/RedHat/apache-2.4.config.jinja index 63dfed7..763cb1f 100644 --- a/apache/files/RedHat/apache-2.4.config.jinja +++ b/apache/files/RedHat/apache-2.4.config.jinja @@ -1,3 +1,6 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {% from "apache/map.jinja" import apache with context %} # # This is the main Apache HTTP server configuration file. It contains the @@ -41,8 +44,6 @@ ServerRoot "/etc/httpd" # #Listen 12.34.56.78:80 -# Managed by saltstack - {% if salt['pillar.get']('apache:sites') is mapping %} {%- set listen_directives = [] %} {%- for id, site in salt['pillar.get']('apache:sites').items() %} diff --git a/apache/files/tls-defaults.conf.jinja b/apache/files/tls-defaults.conf.jinja index 9ee0a67..a55778d 100644 --- a/apache/files/tls-defaults.conf.jinja +++ b/apache/files/tls-defaults.conf.jinja @@ -1,5 +1,6 @@ -# Managed by saltstack - +# +# This file is managed by Salt! Do not edit by hand! +# {% set data = { 'SSLCipherSuite': 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA', 'SSLCompression': 'Off', diff --git a/apache/vhosts/minimal.tmpl b/apache/vhosts/minimal.tmpl index 38545cb..b74e059 100644 --- a/apache/vhosts/minimal.tmpl +++ b/apache/vhosts/minimal.tmpl @@ -1,3 +1,6 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {# Define default values here so the template below can just focus on layout #} {%- set sitename = site.get('ServerName', id) -%} diff --git a/apache/vhosts/proxy.tmpl b/apache/vhosts/proxy.tmpl index b762a9e..0567eb3 100644 --- a/apache/vhosts/proxy.tmpl +++ b/apache/vhosts/proxy.tmpl @@ -1,3 +1,6 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {# Define default values here so the template below can just focus on layout #} {% from "apache/map.jinja" import apache with context %} {% set sitename = site.get('ServerName', id) %} diff --git a/apache/vhosts/redirect.tmpl b/apache/vhosts/redirect.tmpl index af86ea1..d838837 100644 --- a/apache/vhosts/redirect.tmpl +++ b/apache/vhosts/redirect.tmpl @@ -1,3 +1,6 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {# Define default values here so the template below can just focus on layout #} {%- from "apache/map.jinja" import apache with context %} {%- set sitename = site.get('ServerName', id) %} diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index b600f5f..04cb6ec 100644 --- a/apache/vhosts/standard.tmpl +++ b/apache/vhosts/standard.tmpl @@ -1,3 +1,6 @@ +# +# This file is managed by Salt! Do not edit by hand! +# {# Define default values here so the template below can just focus on layout #} {%- set sitename = site.get('ServerName', id) -%}