From 3535ecae9a8eaf2f3cd853c579f56f353668c959 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Mon, 20 Jan 2014 20:47:04 +0000 Subject: [PATCH] Removed apt from items where it is not required, also modified fcgid to include apache as it requires the apache package. --- apache/debian_full.sls | 1 - apache/fcgid.sls | 2 +- apache/mod_proxy.sls | 1 - apache/mod_proxy_http.sls | 1 - apache/php5.sls | 1 - apache/rewrite.sls | 1 - apache/vhost_alias.sls | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apache/debian_full.sls b/apache/debian_full.sls index a575279..8f0f114 100644 --- 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 diff --git a/apache/fcgid.sls b/apache/fcgid.sls index c52089a..70f2f3e 100644 --- a/apache/fcgid.sls +++ b/apache/fcgid.sls @@ -1,7 +1,7 @@ {% if grains['os_family']=="Debian" %} include: - - apt + - apache mod-fcgid: pkg.installed: diff --git a/apache/mod_proxy.sls b/apache/mod_proxy.sls index e4bcc1a..0b21961 100644 --- a/apache/mod_proxy.sls +++ b/apache/mod_proxy.sls @@ -1,7 +1,6 @@ {% if grains['os_family']=="Debian" %} include: - - apt - apache a2enmod proxy: diff --git a/apache/mod_proxy_http.sls b/apache/mod_proxy_http.sls index 8fa444b..fcdbae3 100644 --- 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 diff --git a/apache/php5.sls b/apache/php5.sls index 9519aa4..6ead2a5 100644 --- a/apache/php5.sls +++ b/apache/php5.sls @@ -1,7 +1,6 @@ {% if grains['os_family']=="Debian" %} include: - - apt - apache mod-php5: diff --git a/apache/rewrite.sls b/apache/rewrite.sls index d9cf8e4..5f86ab3 100644 --- a/apache/rewrite.sls +++ b/apache/rewrite.sls @@ -1,7 +1,6 @@ {% if grains['os_family']=="Debian" %} include: - - apt - apache a2enmod rewrite: diff --git a/apache/vhost_alias.sls b/apache/vhost_alias.sls index 246840f..21ac644 100644 --- 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: