Merge pull request #27 from KennethWilke/master

fixed things seth mentioned in class

apache/init.sls

@@ -1,24 +1,20 @@
 {% from "apache/map.jinja" import apache with context %}
 
 apache:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ apache.server }}
-  service:
-    - running
+  service.running:
     - name: {{ apache.service }}
     - enable: True
 
 # The following states are inert by default and can be used by other states to
 # trigger a restart or reload as needed.
 apache-reload:
-  module:
-    - wait
+  module.wait:
     - name: service.reload
     - m_name: {{ apache.service }}
 
 apache-restart:
-  module:
-    - wait
+  module.wait:
     - name: service.restart
     - m_name: {{ apache.service }}

apache/mod_wsgi.sls

@@ -4,16 +4,14 @@ include:
   - apache
 
 mod_wsgi:
-  pkg:
-    - installed
+  pkg.installed:
     - name: {{ apache.mod_wsgi }}
     - require:
       - pkg: apache
 
 {% if grains.get('os_family') == 'RedHat' %}
 /etc/httpd/conf.d/wsgi.conf:
-  file:
-    - uncomment
+  file.uncomment:
     - regex: LoadModule
     - require:
       - pkg: mod_wsgi