diff --git a/apache/files/RedHat/apache-2.2.config.jinja b/apache/files/RedHat/apache-2.2.config.jinja index 94e2680..c2bc11f 100644 --- a/apache/files/RedHat/apache-2.2.config.jinja +++ b/apache/files/RedHat/apache-2.2.config.jinja @@ -387,7 +387,11 @@ LogLevel warn # in HTML content to override this choice, comment out this # directive: # -AddDefaultCharset UTF-8 +{%- if apache.get('default_charset', False) is none %} +# AddDefaultCharset UTF-8 +{%- else %} +AddDefaultCharset {{ apache.get('default_charset', 'UTF-8') }} +{%- endif %} # diff --git a/apache/files/RedHat/apache-2.4.config.jinja b/apache/files/RedHat/apache-2.4.config.jinja index 556b90e..c5770da 100644 --- a/apache/files/RedHat/apache-2.4.config.jinja +++ b/apache/files/RedHat/apache-2.4.config.jinja @@ -348,7 +348,11 @@ LogLevel warn # in HTML content to override this choice, comment out this # directive: # -AddDefaultCharset {{ apache.default_charset }} +{%- if apache.get('default_charset', False) is none %} +# AddDefaultCharset UTF-8 +{%- else %} +AddDefaultCharset {{ apache.get('default_charset', 'UTF-8') }} +{%- endif %} #