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.
2014-01-20 12:49:32 -08:00 · 2014-01-20 12:49:32 -08:00 · aca9d6eeb3
commit aca9d6eeb3
parent ad541eb5bf 3535ecae9a
7 changed files with 1 additions and 7 deletions
--- a/apache/debian_full.sls
+++ b/apache/debian_full.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache
  - apache.register_site

--- a/apache/fcgid.sls
+++ b/apache/fcgid.sls
@ -1,7 +1,7 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
+  - apache

 mod-fcgid:
  pkg.installed:
--- a/apache/mod_proxy.sls
+++ b/apache/mod_proxy.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache

 a2enmod proxy:
--- a/apache/mod_proxy_http.sls
+++ b/apache/mod_proxy_http.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache
  - apache.mod_proxy

--- a/apache/php5.sls
+++ b/apache/php5.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache

 mod-php5:
--- a/apache/rewrite.sls
+++ b/apache/rewrite.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache

 a2enmod rewrite:
--- a/apache/vhost_alias.sls
+++ b/apache/vhost_alias.sls
@ -1,7 +1,6 @@
 {% if grains['os_family']=="Debian" %}

 include:
-  - apt
  - apache

 a2enmod vhost_alias: