saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad Thurber 2015-10-20 14:37:22 -04:00
parent 9020f8d82a
commit fb2f41afe4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/modules.sls
View File

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