From fb2f41afe43826d1aae9be0ecf99cb3020a01521 Mon Sep 17 00:00:00 2001 From: Brad Thurber Date: Tue, 20 Oct 2015 14:37:22 -0400 Subject: [PATCH] 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