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
2016-06-29 18:18:30 +02:00 · 2016-06-29 18:18:30 +02:00 · 9aca4c35b7
commit 9aca4c35b7
parent 61439a60a8
3 changed files with 4 additions and 1 deletions
--- a/apache/files/RedHat/apache-2.4.config.jinja
+++ b/apache/files/RedHat/apache-2.4.config.jinja
@ -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>
    #
--- a/apache/map.jinja
+++ b/apache/map.jinja
@ -40,6 +40,7 @@
        'logdir': '/var/log/httpd',
        'logrotatedir': '/etc/logrotate.d/httpd',
        'wwwdir': '/var/www',
+        'default_charset': 'UTF-8',
        'use_require': False,
    },
    'Suse': {
--- a/pillar.example
+++ b/pillar.example
@ -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