Added "Managed by Salt..." headers in template and made them unifom across the formula
This commit is contained in:
parent
6de9dd885d
commit
fcb434e248
@ -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.
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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() %}
|
||||
|
@ -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() %}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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() %}
|
||||
|
@ -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() %}
|
||||
|
@ -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',
|
||||
|
@ -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) -%}
|
||||
|
||||
|
@ -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) %}
|
||||
|
@ -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) %}
|
||||
|
@ -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) -%}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user