saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(redhat/apache-2.x.config.jinja): allow override of default_charset

Browse Source 
The current Red Hat config allows to set DefaultCharset to a value.
In certain situations it is necessary to leave it unconfigured thouguh.

Make the content optional, if the value of apache.default_charset is None,
the item is skipped. Otherwise it defaults to UTF-8.
This commit is contained in:
Andreas Thienemann 2020-07-16 20:43:54 +02:00 committed by GitHub
parent 78bd21ad62
commit 648f589cc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache/files/RedHat/apache-2.2.config.jinja
View File

@ -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 %}
<IfModule mime_magic_module>
#

6
apache/files/RedHat/apache-2.4.config.jinja
View File

@ -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 %}
<IfModule mime_magic_module>
#