瀏覽代碼

Merge pull request #193 from saltstack-formulas/susefix

workaround for #192
master
Niels Abspoel 7 年之前
父節點
當前提交
1561224dfc
共有 2 個檔案被更改,包括 2 行新增2 行删除
  1. +1
    -1
      apache/config.sls
  2. +1
    -1
      apache/mod_php5.sls

+ 1
- 1
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

+ 1
- 1
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

Loading…
取消
儲存