Merge pull request #68 from msciciel/msciciel

RedHat fixes: change default vhostdir to redhat official

apache/config.sls

@@ -13,6 +13,13 @@ include:
     - watch_in:
       - service: apache
 
+{{ apache.vhostdir }}:
+  file.directory:
+    - require:
+      - pkg: apache
+    - watch_in:
+      - service: apache
+
 {% if grains['os_family']=="Debian" %}
 /etc/apache2/envvars:
   file.managed:

apache/files/RedHat/apache.config.jinja

@@ -354,3 +354,4 @@ EnableSendfile on
 #
 # Load config files in the "/etc/httpd/conf.d" directory, if any.
 IncludeOptional conf.d/*.conf
+IncludeOptional vhosts.d/*.conf

apache/map.jinja

@@ -25,7 +25,7 @@
         'mod_wsgi': 'mod_wsgi',
         'mod_php5': 'php',
 
-        'vhostdir': '/etc/httpd/conf.d',
+        'vhostdir': '/etc/httpd/vhosts.d',
         'confdir': '/etc/httpd/conf.d',
         'confext': '.conf',
         'default_site': 'default',