Browse Source

RedHat fixes: change default vhostdir to redhat official default /etc/httpd/vhosts.d, add state for ensuring that vhostdir exists, include vhosts.d/*.conf in httpd.conf

tags/v0.37.4
Krzysztof Pawłowski 9 years ago
parent
commit
b6fe515ed8
3 changed files with 9 additions and 1 deletions
  1. +7
    -0
      apache/config.sls
  2. +1
    -0
      apache/files/RedHat/apache.config.jinja
  3. +1
    -1
      apache/map.jinja

+ 7
- 0
apache/config.sls View File

- watch_in: - watch_in:
- service: apache - service: apache


{{ apache.vhostdir }}:
file.directory:
- require:
- pkg: apache
- watch_in:
- service: apache

{% if grains['os_family']=="Debian" %} {% if grains['os_family']=="Debian" %}
/etc/apache2/envvars: /etc/apache2/envvars:
file.managed: file.managed:

+ 1
- 0
apache/files/RedHat/apache.config.jinja View File

# #
# Load config files in the "/etc/httpd/conf.d" directory, if any. # Load config files in the "/etc/httpd/conf.d" directory, if any.
IncludeOptional conf.d/*.conf IncludeOptional conf.d/*.conf
IncludeOptional vhosts.d/*.conf

+ 1
- 1
apache/map.jinja View File

'mod_wsgi': 'mod_wsgi', 'mod_wsgi': 'mod_wsgi',
'mod_php5': 'php', 'mod_php5': 'php',


'vhostdir': '/etc/httpd/conf.d',
'vhostdir': '/etc/httpd/vhosts.d',
'confdir': '/etc/httpd/conf.d', 'confdir': '/etc/httpd/conf.d',
'confext': '.conf', 'confext': '.conf',
'default_site': 'default', 'default_site': 'default',

Loading…
Cancel
Save