Merge pull request #221 from netmanagers/master

Added "Managed by Salt..." headers in templates

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.

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
 

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
 

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

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

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

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() %}

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() %}

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
 

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
 

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
 

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() %}

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() %}

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',

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) -%}
 

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) %}

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) %}

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) -%}