saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #221 from netmanagers/master

Browse Source 
Added "Managed by Salt..." headers in templates
This commit is contained in:
Niels Abspoel 2018-02-04 14:42:00 +01:00 committed by GitHub
commit 142fb59bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/files/Debian/apache-2.4.config.jinja
View File

@ -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 # This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions. # configuration directives that give the server its instructions.

6
apache/files/Debian/envvars-2.2.jinja
View File

@ -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 # envvars - default environment variables for apache2ctl

6
apache/files/Debian/envvars-2.4.jinja
View File

@ -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 # envvars - default environment variables for apache2ctl

5
apache/files/Debian/mpm/mpm_event.conf.jinja
View File

@ -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', {}) %} {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %}
# event MPM # event MPM

5
apache/files/Debian/mpm/mpm_prefork.conf.jinja
View File

@ -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', {}) %} {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %}
# prefork MPM # prefork MPM

5
apache/files/Debian/mpm/mpm_worker.conf.jinja
View File

@ -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', {}) %} {%- set mpm_param = salt['pillar.get']('apache:mpm:params', {}) %}
# worker MPM # worker MPM

5
apache/files/Debian/ports-2.2.conf.jinja
View File

@ -1,7 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- from "apache/map.jinja" import apache with context -%} {%- from "apache/map.jinja" import apache with context -%}
# Managed by saltstack
{% if salt['pillar.get']('apache:sites') is mapping %} {% if salt['pillar.get']('apache:sites') is mapping %}
{%- set listen_directives = [] %} {%- set listen_directives = [] %}
{%- for id, site in salt['pillar.get']('apache:sites').items() %} {%- for id, site in salt['pillar.get']('apache:sites').items() %}

5
apache/files/Debian/ports-2.4.conf.jinja
View File

@ -1,7 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- from "apache/map.jinja" import apache with context -%} {%- from "apache/map.jinja" import apache with context -%}
# Managed by saltstack
{% if salt['pillar.get']('apache:sites') is mapping %} {% if salt['pillar.get']('apache:sites') is mapping %}
{%- set listen_directives = [] %} {%- set listen_directives = [] %}
{%- for id, site in salt['pillar.get']('apache:sites').items() %} {%- for id, site in salt['pillar.get']('apache:sites').items() %}

4
apache/files/FreeBSD/envvars-2.4.jinja
View File

@ -1,5 +1,7 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- from "apache/map.jinja" import apache with context -%} {%- from "apache/map.jinja" import apache with context -%}
# Managed by saltstack
# envvars - default environment variables for apache2ctl # envvars - default environment variables for apache2ctl

4
apache/files/FreeBSD/generic_module.conf.jinja
View File

@ -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 LoadModule {{ module_name }}_module libexec/apache24/mod_{{ module_name }}.so

4
apache/files/FreeBSD/mod_ssl.conf.jinja
View File

@ -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 LoadModule ssl_module libexec/apache24/mod_ssl.so

5
apache/files/FreeBSD/ports-2.4.conf.jinja
View File

@ -1,7 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- from "apache/map.jinja" import apache with context -%} {%- from "apache/map.jinja" import apache with context -%}
# Managed by saltstack
{% if salt['pillar.get']('apache:sites') is mapping %} {% if salt['pillar.get']('apache:sites') is mapping %}
{%- set listen_directives = [] %} {%- set listen_directives = [] %}
{%- for id, site in salt['pillar.get']('apache:sites').items() %} {%- for id, site in salt['pillar.get']('apache:sites').items() %}

5
apache/files/RedHat/apache-2.4.config.jinja
View File

@ -1,3 +1,6 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{% from "apache/map.jinja" import apache with context %} {% from "apache/map.jinja" import apache with context %}
# #
# This is the main Apache HTTP server configuration file. It contains the # 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 #Listen 12.34.56.78:80
# Managed by saltstack
{% if salt['pillar.get']('apache:sites') is mapping %} {% if salt['pillar.get']('apache:sites') is mapping %}
{%- set listen_directives = [] %} {%- set listen_directives = [] %}
{%- for id, site in salt['pillar.get']('apache:sites').items() %} {%- for id, site in salt['pillar.get']('apache:sites').items() %}

5
apache/files/tls-defaults.conf.jinja
View File

@ -1,5 +1,6 @@
# Managed by saltstack #
# This file is managed by Salt! Do not edit by hand!
#
{% set data = { {% 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', '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', 'SSLCompression': 'Off',

3
apache/vhosts/minimal.tmpl
View File

@ -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 #} {# Define default values here so the template below can just focus on layout #}
{%- set sitename = site.get('ServerName', id) -%} {%- set sitename = site.get('ServerName', id) -%}

3
apache/vhosts/proxy.tmpl
View File

@ -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 #} {# Define default values here so the template below can just focus on layout #}
{% from "apache/map.jinja" import apache with context %} {% from "apache/map.jinja" import apache with context %}
{% set sitename = site.get('ServerName', id) %} {% set sitename = site.get('ServerName', id) %}

3
apache/vhosts/redirect.tmpl
View File

@ -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 #} {# Define default values here so the template below can just focus on layout #}
{%- from "apache/map.jinja" import apache with context %} {%- from "apache/map.jinja" import apache with context %}
{%- set sitename = site.get('ServerName', id) %} {%- set sitename = site.get('ServerName', id) %}

3
apache/vhosts/standard.tmpl
View File

@ -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 #} {# Define default values here so the template below can just focus on layout #}
{%- set sitename = site.get('ServerName', id) -%} {%- set sitename = site.get('ServerName', id) -%}