Browse Source

Added "Managed by Salt..." headers in template and made them unifom across the formula

tags/v0.37.4
Javier Bértoli 7 years ago
parent
commit
fcb434e248
18 changed files with 56 additions and 24 deletions
  1. +3
    -1
      apache/files/Debian/apache-2.4.config.jinja
  2. +4
    -2
      apache/files/Debian/envvars-2.2.jinja
  3. +4
    -2
      apache/files/Debian/envvars-2.4.jinja
  4. +3
    -2
      apache/files/Debian/mpm/mpm_event.conf.jinja
  5. +3
    -2
      apache/files/Debian/mpm/mpm_prefork.conf.jinja
  6. +3
    -2
      apache/files/Debian/mpm/mpm_worker.conf.jinja
  7. +3
    -2
      apache/files/Debian/ports-2.2.conf.jinja
  8. +3
    -2
      apache/files/Debian/ports-2.4.conf.jinja
  9. +3
    -1
      apache/files/FreeBSD/envvars-2.4.jinja
  10. +3
    -1
      apache/files/FreeBSD/generic_module.conf.jinja
  11. +3
    -1
      apache/files/FreeBSD/mod_ssl.conf.jinja
  12. +3
    -2
      apache/files/FreeBSD/ports-2.4.conf.jinja
  13. +3
    -2
      apache/files/RedHat/apache-2.4.config.jinja
  14. +3
    -2
      apache/files/tls-defaults.conf.jinja
  15. +3
    -0
      apache/vhosts/minimal.tmpl
  16. +3
    -0
      apache/vhosts/proxy.tmpl
  17. +3
    -0
      apache/vhosts/redirect.tmpl
  18. +3
    -0
      apache/vhosts/standard.tmpl

+ 3
- 1
apache/files/Debian/apache-2.4.config.jinja View File

# 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.

+ 4
- 2
apache/files/Debian/envvars-2.2.jinja View File

{%- 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



+ 4
- 2
apache/files/Debian/envvars-2.4.jinja View File

{%- 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



+ 3
- 2
apache/files/Debian/mpm/mpm_event.conf.jinja View File

# 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

+ 3
- 2
apache/files/Debian/mpm/mpm_prefork.conf.jinja View File

# 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

+ 3
- 2
apache/files/Debian/mpm/mpm_worker.conf.jinja View File

# 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

+ 3
- 2
apache/files/Debian/ports-2.2.conf.jinja View File

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

+ 3
- 2
apache/files/Debian/ports-2.4.conf.jinja View File

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

+ 3
- 1
apache/files/FreeBSD/envvars-2.4.jinja View File

#
# 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



+ 3
- 1
apache/files/FreeBSD/generic_module.conf.jinja View File

# 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



+ 3
- 1
apache/files/FreeBSD/mod_ssl.conf.jinja View File

# 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



+ 3
- 2
apache/files/FreeBSD/ports-2.4.conf.jinja View File

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

+ 3
- 2
apache/files/RedHat/apache-2.4.config.jinja View File

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

+ 3
- 2
apache/files/tls-defaults.conf.jinja View File

# 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
- 0
apache/vhosts/minimal.tmpl View File

#
# 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
- 0
apache/vhosts/proxy.tmpl View File

#
# 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
- 0
apache/vhosts/redirect.tmpl View File

#
# 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
- 0
apache/vhosts/standard.tmpl View File

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



Loading…
Cancel
Save