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

RedHat: Made AddDefaultCharset Directive configurable (#147)

Browse Source 
* RedHat: Made AddDefaultCharset Directive configurable

* Added description of apache:lookup:default_charset to pillar.example, sane default equals former hardcoded UTF-8
This commit is contained in:
abehling 2016-06-29 18:18:30 +02:00 committed by Forrest
parent 61439a60a8
commit 9aca4c35b7
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,7 +345,7 @@ LogLevel warn
# in HTML content to override this choice, comment out this # in HTML content to override this choice, comment out this
# directive: # directive:
# #
AddDefaultCharset UTF-8 AddDefaultCharset {{ apache.default_charset }}
<IfModule mime_magic_module> <IfModule mime_magic_module>
# #

1
apache/map.jinja
View File

@ -40,6 +40,7 @@
'logdir': '/var/log/httpd', 'logdir': '/var/log/httpd',
'logrotatedir': '/etc/logrotate.d/httpd', 'logrotatedir': '/etc/logrotate.d/httpd',
'wwwdir': '/var/www', 'wwwdir': '/var/www',
'default_charset': 'UTF-8',
'use_require': False, 'use_require': False,
}, },
'Suse': { 'Suse': {

2
pillar.example
View File

@ -18,6 +18,8 @@ apache:
# ``apache.mod_wsgi`` formula additional configuration: # ``apache.mod_wsgi`` formula additional configuration:
mod_wsgi: mod_wsgi mod_wsgi: mod_wsgi
# Default value for AddDefaultCharset in RedHat configuration
default_charset: 'UTF-8'
global: global:
# global apache directives # global apache directives