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