Merge pull request #193 from saltstack-formulas/susefix

workaround for #192
2017-08-24 21:44:11 +02:00 · 2017-08-24 21:44:11 +02:00 · 1561224dfc
commit 1561224dfc
parent 0b117e522d be024a6475
2 changed files with 2 additions and 2 deletions
--- 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
--- 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