diff --git a/apache/files/RedHat/apache-2.4.config.jinja b/apache/files/RedHat/apache-2.4.config.jinja index 2393bad..33651c7 100644 --- 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 }} # diff --git a/apache/map.jinja b/apache/map.jinja index e8a61e1..ee0b1ba 100644 --- 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': { diff --git a/pillar.example b/pillar.example index 34ffe80..cdd6a15 100644 --- 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