Merge pull request #290 from SuperTux88/fix-modules-enable

Fix modules enable

apache/config/modules/install.sls

@@ -18,7 +18,7 @@ apache-config-modules-{{ module }}-enable:
 
   cmd.run:
     - name: a2enmod -f {{ module }}
-    - onlyif: ls {{ apache.moddir }}/{{ module }}.load
+    - unless: ls {{ apache.moddir }}/{{ module }}.load
 
         {% elif grains.os_family in ('RedHat', 'Arch') %}
 

apache/config/vhosts/proxy.tmpl

@@ -16,7 +16,7 @@
 
     'LogLevel': site.get('LogLevel', 'warn'),
     'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
-    'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\""'),
+    'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\""'),
     'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
 
     'ProxyRequests': site.get('ProxyRequests', 'Off'),

apache/config/vhosts/redirect.tmpl

@@ -17,7 +17,7 @@
 
     'LogLevel': site.get('LogLevel', 'warn'),
     'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
-    'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O"'),
+    'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b"'),
     'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
 
     'RedirectSource': site.get('RedirectSource', '/'),

apache/osfamilymap.yaml

@@ -47,7 +47,7 @@ Debian:
   logdir: /var/log/apache2
   logrotatedir: /etc/logrotate.d/apache2
   wwwdir: /srv
-  moddir: /etc/apache2/mods-available
+  moddir: /etc/apache2/mods-enabled
   sitesdir: /etc/apache2/sites-enabled
 
 RedHat:

test/salt/pillar/modules.sls

@@ -377,7 +377,6 @@ apache:
   modules:
     enabled:   # List modules to enable
       - ssl
-      - prefork
       - rewrite
       - proxy
       - proxy_ajp
@@ -385,7 +384,6 @@ apache:
       - headers
       # geoip
       - status
-      - logio
       - dav
       - dav_fs
       - dav_lock