Merge pull request #85 from bradthurber/redhat_module_fixes
Redhat module.sls fixes
This commit is contained in:
commit
84519a6aea
@ -31,9 +31,9 @@ include:
|
|||||||
- apache
|
- apache
|
||||||
|
|
||||||
{% 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/\(^#\)\(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 {{ module }}_module
|
- unless: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
|
||||||
- order: 225
|
- order: 225
|
||||||
- require:
|
- require:
|
||||||
- pkg: apache
|
- pkg: apache
|
||||||
@ -42,9 +42,9 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^#\)\(LoadModule.{{
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
{% 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/\(^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 {{ module }}_module
|
- onlyif: httpd -M 2> /dev/null | grep "[[:space:]]{{ module }}_module"
|
||||||
- order: 225
|
- order: 225
|
||||||
- require:
|
- require:
|
||||||
- pkg: apache
|
- pkg: apache
|
||||||
|
Loading…
Reference in New Issue
Block a user