Merge pull request #85 from bradthurber/redhat_module_fixes

Redhat module.sls fixes

apache/modules.sls

@@ -31,9 +31,9 @@ include:
   - apache
  
 {% for module in salt['pillar.get']('apache:modules:enabled', []) %}
-find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(LoadModule.{{ module }}_module\)/\2/g' {} \;:
+find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(\s*LoadModule.{{ module }}_module\)/\2/g' {} \;:
   cmd.run:
-    - unless: httpd -M 2> /dev/null | grep {{ module }}_module
+    - unless: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
     - order: 225
     - require:
       - pkg: apache
@@ -42,9 +42,9 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(LoadModule.{{
 {% endfor %}
 
 {% for module in salt['pillar.get']('apache:modules:disabled', []) %}
-find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^LoadModule.{{ module }}_module\)/#\1/g' {} \;:
+find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^\s*LoadModule.{{ module }}_module\)/#\1/g' {} \;:
   cmd.run:
-    - onlyif: httpd -M 2> /dev/null | grep {{ module }}_module
+    - onlyif: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
     - order: 225
     - require:
       - pkg: apache