浏览代码

Merge pull request #18 from gravyboat/master

Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package.
master
Seth House 11 年前
父节点
当前提交
aca9d6eeb3
共有 7 个文件被更改,包括 1 次插入7 次删除
  1. +0
    -1
      apache/debian_full.sls
  2. +1
    -1
      apache/fcgid.sls
  3. +0
    -1
      apache/mod_proxy.sls
  4. +0
    -1
      apache/mod_proxy_http.sls
  5. +0
    -1
      apache/php5.sls
  6. +0
    -1
      apache/rewrite.sls
  7. +0
    -1
      apache/vhost_alias.sls

+ 0
- 1
apache/debian_full.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache
- apache.register_site


+ 1
- 1
apache/fcgid.sls 查看文件

@@ -1,7 +1,7 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache

mod-fcgid:
pkg.installed:

+ 0
- 1
apache/mod_proxy.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache

a2enmod proxy:

+ 0
- 1
apache/mod_proxy_http.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache
- apache.mod_proxy


+ 0
- 1
apache/php5.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache

mod-php5:

+ 0
- 1
apache/rewrite.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache

a2enmod rewrite:

+ 0
- 1
apache/vhost_alias.sls 查看文件

@@ -1,7 +1,6 @@
{% if grains['os_family']=="Debian" %}

include:
- apt
- apache

a2enmod vhost_alias:

正在加载...
取消
保存