Browse Source

RedHat: Made AddDefaultCharset Directive configurable (#147)

* RedHat: Made AddDefaultCharset Directive configurable

* Added description of apache:lookup:default_charset to pillar.example, sane default equals former hardcoded UTF-8
tags/v0.37.4
abehling 8 years ago
parent
commit
9aca4c35b7
3 changed files with 4 additions and 1 deletions
  1. +1
    -1
      apache/files/RedHat/apache-2.4.config.jinja
  2. +1
    -0
      apache/map.jinja
  3. +2
    -0
      pillar.example

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

@@ -345,7 +345,7 @@ LogLevel warn
# in HTML content to override this choice, comment out this
# directive:
#
AddDefaultCharset UTF-8
AddDefaultCharset {{ apache.default_charset }}

<IfModule mime_magic_module>
#

+ 1
- 0
apache/map.jinja View File

@@ -40,6 +40,7 @@
'logdir': '/var/log/httpd',
'logrotatedir': '/etc/logrotate.d/httpd',
'wwwdir': '/var/www',
'default_charset': 'UTF-8',
'use_require': False,
},
'Suse': {

+ 2
- 0
pillar.example View File

@@ -18,6 +18,8 @@ apache:
# ``apache.mod_wsgi`` formula additional configuration:
mod_wsgi: mod_wsgi

# Default value for AddDefaultCharset in RedHat configuration
default_charset: 'UTF-8'

global:
# global apache directives

Loading…
Cancel
Save