Merge pull request #20 from adamherzog/redhat-vhost-config-extension

Add vhost config file extension for RedHat-based distributions

apache/map.jinja

@@ -7,6 +7,7 @@
 
         'vhostdir': '/etc/apache2/sites-available',
         'confdir': '/etc/apache2/conf.d',
+        'confext': '',
         'logdir': '/var/log/apache2',
         'wwwdir': '/srv',
     },
@@ -18,6 +19,7 @@
 
         'vhostdir': '/etc/httpd/conf.d',
         'confdir': '/etc/httpd/conf.d',
+        'confext': '.conf',
         'logdir': '/var/log/httpd',
         'wwwdir': '/var/www',
     },
@@ -29,6 +31,7 @@
 
         'vhostdir': '/usr/local/etc/apache22/Includes',
         'confdir': '/usr/local/etc/apache22/Includes',
+        'confext': '',
         'logdir': '/var/log/',
         'wwwdir': '/usr/local/www/apache22/',
     },

apache/vhosts/standard.sls

@@ -8,7 +8,7 @@ include:
 {{ id }}:
   file:
     - managed
-    - name: {{ apache.vhostdir }}/{{ id }}
+    - name: {{ apache.vhostdir }}/{{ id }}{{ apache.confext }}
     - source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }}
     - template: {{ site.get('template_engine', 'jinja') }}
     - context:

pillar.example

@@ -3,7 +3,9 @@ apache:
   server: apache2
   service: apache2
 
+  vhostdir: /etc/apache2/sites-available
   confdir: /etc/apache2/conf.d
+  confext: .conf
   logdir: /var/log/apache2
   wwwdir: /srv/apache2