Explorar el Código

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

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.
tags/v0.40.0
Andreas Thienemann hace 4 años
padre
commit
648f589cc3
Ninguna cuenta vinculada a la dirección de correo electrónico del committer
Se han modificado 2 ficheros con 10 adiciones y 2 borrados
  1. +5
    -1
      apache/files/RedHat/apache-2.2.config.jinja
  2. +5
    -1
      apache/files/RedHat/apache-2.4.config.jinja

+ 5
- 1
apache/files/RedHat/apache-2.2.config.jinja Ver fichero

@@ -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>
#

+ 5
- 1
apache/files/RedHat/apache-2.4.config.jinja Ver fichero

@@ -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>
#

Cargando…
Cancelar
Guardar