From 24698575f19056241ab7c088a0d3b82984072be5 Mon Sep 17 00:00:00 2001
From: Brad Thurber <brad.thurber@gmail.com>
Date: Tue, 20 Oct 2015 13:41:51 -0400
Subject: [PATCH 1/3] add space before grep module check

---
 apache/modules.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache/modules.sls b/apache/modules.sls
index d4b809e..628b66c 100644
--- a/apache/modules.sls
+++ b/apache/modules.sls
@@ -33,7 +33,7 @@ include:
 {% 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' {} \;:
   cmd.run:
-    - unless: httpd -M 2> /dev/null | grep {{ module }}_module
+    - unless: httpd -M 2> /dev/null | grep '\s{{ module }}_module'
     - order: 225
     - require:
       - pkg: apache
@@ -44,7 +44,7 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(LoadModule.{{
 {% 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' {} \;:
   cmd.run:
-    - onlyif: httpd -M 2> /dev/null | grep {{ module }}_module
+    - onlyif: httpd -M 2> /dev/null | grep '\s{{ module }}_module'
     - order: 225
     - require:
       - pkg: apache

From 9020f8d82af548ca476849a1ceeefc5792909abb Mon Sep 17 00:00:00 2001
From: Brad Thurber <brad.thurber@gmail.com>
Date: Tue, 20 Oct 2015 14:03:33 -0400
Subject: [PATCH 2/3] sed needs to allow spaces before LoadModule

---
 apache/modules.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache/modules.sls b/apache/modules.sls
index 628b66c..7e885ee 100644
--- a/apache/modules.sls
+++ b/apache/modules.sls
@@ -31,7 +31,7 @@ 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 '\s{{ module }}_module'
     - order: 225
@@ -42,7 +42,7 @@ 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 '\s{{ module }}_module'
     - order: 225

From fb2f41afe43826d1aae9be0ecf99cb3020a01521 Mon Sep 17 00:00:00 2001
From: Brad Thurber <brad.thurber@gmail.com>
Date: Tue, 20 Oct 2015 14:37:22 -0400
Subject: [PATCH 3/3] debugging - the \s gets turned into \\s for some reason -
 so using [[:space:]] instead. This seems to be the grep-favored approach
 http://stackoverflow.com/questions/4233159/grep-regex-whitespace-behavior

---
 apache/modules.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache/modules.sls b/apache/modules.sls
index 7e885ee..9cb3415 100644
--- a/apache/modules.sls
+++ b/apache/modules.sls
@@ -33,7 +33,7 @@ include:
 {% for module in salt['pillar.get']('apache:modules:enabled', []) %}
 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 '\s{{ module }}_module'
+    - unless: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
     - order: 225
     - require:
       - pkg: apache
@@ -44,7 +44,7 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(\s*LoadModule
 {% for module in salt['pillar.get']('apache:modules:disabled', []) %}
 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 '\s{{ module }}_module'
+    - onlyif: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
     - order: 225
     - require:
       - pkg: apache