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

Merge pull request #68 from msciciel/msciciel

Browse Source 
RedHat fixes: change default vhostdir to redhat official
This commit is contained in:
puneet kandhari 2015-07-22 08:07:48 -05:00
commit 25179778ed
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache/config.sls
View File

@ -13,6 +13,13 @@ include:
- 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
apache/files/RedHat/apache.config.jinja
View File

@ -354,3 +354,4 @@ EnableSendfile on
# #
# 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

2
apache/map.jinja
View File

@ -25,7 +25,7 @@
'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',