Browse Source

Merge pull request #193 from saltstack-formulas/susefix

workaround for #192
master
Niels Abspoel 7 years ago
parent
commit
1561224dfc
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      apache/config.sls
  2. +1
    -1
      apache/mod_php5.sls

+ 1
- 1
apache/config.sls View File

- service: apache - service: apache
{% endif %} {% endif %}


{% if grains['os_family']=="Suse" %}
{% if grains['os_family']=="Suse" or salt['grains.get']('os') == 'SUSE' %}
/etc/apache2/global.conf: /etc/apache2/global.conf:
file.managed: file.managed:
- template: jinja - template: jinja

+ 1
- 1
apache/mod_php5.sls View File



{% endif %} {% endif %}


{% if grains['os_family']=="Suse" %}
{% if grains['os_family']=="Suse" or salt['grains.get']('os') == 'SUSE' %}
/etc/sysconfig/apache2: /etc/sysconfig/apache2:
file.replace: file.replace:
- unless: grep '^APACHE_MODULES=.*php5' /etc/sysconfig/apache2 - unless: grep '^APACHE_MODULES=.*php5' /etc/sysconfig/apache2

Loading…
Cancel
Save