From e5313af81ab9df7b48d458b4df25df4971988fad Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Thu, 3 Aug 2017 16:18:54 +0200 Subject: [PATCH 1/2] add suse support to apache_modules --- apache/modules.sls | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/apache/modules.sls b/apache/modules.sls index c4301ce..9e08ffa 100644 --- a/apache/modules.sls +++ b/apache/modules.sls @@ -52,4 +52,31 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^\s*LoadModule.{{ m - module: apache-restart {% endfor %} +{% elif grains['os_family']=="Suse" %} + +include: + - apache + +{% for module in salt['pillar.get']('apache:modules:enabled', []) %} +a2enmod {{ module }}: + cmd.run: + - unless: egrep "^APACHE_MODULES=" /etc/sysconfig/apache2 | grep {{ module }} + - order: 225 + - require: + - pkg: apache + - watch_in: + - module: apache-restart +{% endfor %} + +{% for module in salt['pillar.get']('apache:modules:disabled', []) %} +a2dismod -f {{ module }}: + cmd.run: + - onlyif: egrep "^APACHE_MODULES=" /etc/sysconfig/apache2 | grep {{ module }} + - order: 225 + - require: + - pkg: apache + - watch_in: + - module: apache-restart +{% endfor %} + {% endif %} From 9003d2b3ceabab70273132e5fe6737720fc7ddce Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Thu, 3 Aug 2017 21:11:25 +0200 Subject: [PATCH 2/2] update grain check with Suse and SUSE --- apache/modules.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache/modules.sls b/apache/modules.sls index 9e08ffa..adf88c0 100644 --- a/apache/modules.sls +++ b/apache/modules.sls @@ -52,7 +52,7 @@ find /etc/httpd/ -name '*.conf' -type f -exec sed -i -e 's/\(^\s*LoadModule.{{ m - module: apache-restart {% endfor %} -{% elif grains['os_family']=="Suse" %} +{% elif salt['grains.get']('os_family') == 'Suse' or salt['grains.get']('os') == 'SUSE' %} include: - apache