Merge pull request #10 from PCMi/master

Bug fixes and upgrades

apache/debian_full.sls

     - require:
       - pkg: apache
 
-apache-reload:
-  cmd.wait:
-    - name: service apache2 reload
+extend:
+  apache-reload:
     - order: 420
 
-apache-restart:
-  cmd.wait:
-    - name: service apache2 restart
+extend:
+  apache-restart:
     - order: 425
 
 /etc/apache2/sites-available/default:

apache/init.sls

     - running
     - name: {{ apache.service }}
     - enable: True
+
+apache-reload:
+  cmd.wait:
+    - name: service apache2 reload
+
+apache-restart:
+  cmd.wait:
+    - name: service apache2 restart
+

apache/php5.sls

 
 include:
   - apt
+  - apache
 
 mod-php5:
   pkg.installed:

apache/rewrite.sls

 
 include:
   - apt
+  - apache
 
 a2enmod rewrite:
   cmd.run:
     - unless: ls /etc/apache2/mods-enabled/rewrite.load
     - order: 225
+    - require:
+      - pkg: apache
     - watch_in:
       - cmd: apache-restart
 

apache/vhost_alias.sls

+{% if grains['os_family']=="Debian" %}
+
+include:
+  - apt
+  - apache
+
+a2enmod vhost_alias:
+  cmd.run:
+    - unless: ls /etc/apache2/mods-enabled/vhost_alias.load
+    - order: 225
+    - require:
+      - pkg: apache
+    - watch_in:
+      - cmd: apache-restart
+
+{% endif %}

apache/vhosts/standard.sls

     - require:
       - pkg: apache
     - watch_in:
-      - service: apache
+      - cmd: apache-reload
 
 {% if grains.os_family == 'Debian' %}
 a2ensite {{ id }}:
     - run
     - require:
       - file: {{ id }}
+    - watch_in:
+      - cmd: apache-reload
 {% endif %}
 
 {% endfor %}

apache/vhosts/standard.tmpl

 
     'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),
 
+    'DirectoryIndex': site.get('DirectoryIndex'),
+    'UseCanonicalName': site.get('UseCanonicalName'),
+
     'LogLevel': site.get('LogLevel', 'warn'),
     'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
-    'CustomLog': site.get('ErrorLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
+    'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
 
     'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)),
+    'VirtualDocumentRoot': site.get('VirtualDocumentRoot'),
 
     'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename),
     'Directory': {
 
     {% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %}
 
+    {% if site.get('DirectoryIndex') %}DirectoryIndex {{ vals.DirectoryIndex }}{% endif %}
+    {% if site.get('UseCanonicalName') %}UseCanonicalName {{ vals.UseCanonicalName }}{% endif %}
+
     {% if site.get('LogLevel') != False %}LogLevel {{ vals.LogLevel }}{% endif %}
     {% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %}
     {% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }}{% endif %}
 
     {% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
+    {% if site.get('VirtualDocumentRoot') %}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}
 
     {% for path, dir in site.get('Directory', {}).items() %}
     {% set dvals = {
         'Options': dir.get('Options', vals.Directory.Options),
         'Order': dir.get('Order', vals.Directory.Order),
-        'Allow': dir.get('Order', vals.Directory.Allow),
-        'AllowOverride': dir.get('Order', vals.Directory.AllowOverride),
+        'Allow': dir.get('Allow', vals.Directory.Allow),
+        'AllowOverride': dir.get('AllowOverride', vals.Directory.AllowOverride),
     } %}
 
     {% if path == 'default' %}{% set path = vals.Directory_default %}{% endif %}