diff --git a/apache/config.sls b/apache/config.sls index 6a29683..7c7c829 100644 --- a/apache/config.sls +++ b/apache/config.sls @@ -57,7 +57,7 @@ include: - service: apache {% endif %} -{% if grains['os_family']=="Suse" %} +{% if grains['os_family']=="Suse" or salt['grains.get']('os') == 'SUSE' %} /etc/apache2/global.conf: file.managed: - template: jinja diff --git a/apache/mod_php5.sls b/apache/mod_php5.sls index 370e360..93e16a3 100644 --- a/apache/mod_php5.sls +++ b/apache/mod_php5.sls @@ -46,7 +46,7 @@ a2enmod php5: {% endif %} -{% if grains['os_family']=="Suse" %} +{% if grains['os_family']=="Suse" or salt['grains.get']('os') == 'SUSE' %} /etc/sysconfig/apache2: file.replace: - unless: grep '^APACHE_MODULES=.*php5' /etc/sysconfig/apache2