saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #193 from saltstack-formulas/susefix

Browse Source 
workaround for #192
This commit is contained in:
Niels Abspoel 2017-08-24 21:44:11 +02:00 committed by GitHub
commit 1561224dfc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/config.sls
View File

@ -57,7 +57,7 @@ include:
- 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

2
apache/mod_php5.sls
View File

@ -46,7 +46,7 @@ a2enmod php5:
{% 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