User a2enmod so dependencies get enabled

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index e824a03433e5d0e986d5be4fc82b3119165b31d9..c5efdd2c58d938101443b85f17cafb0f3511d35b 100644 (file)
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -40,6 +40,13 @@ action :install do
 end
 
 action :enable do
 end
 
 action :enable do

+  execute "a2enmod-#{new_resource.name}" do
+    command "a2enmod #{new_resource.name}"
+    user "root"
+    group "root"
+    not_if { ::File.exist?(enabled_name("load")) }
+  end
+

   link enabled_name("load") do
     to available_name("load")
     owner "root"
   link enabled_name("load") do
     to available_name("load")
     owner "root"

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0c5c235b7cd4dfcb7362e551ec008b7702cdb34d..82a491a89f302b8fb8abeaad2a620c7ef96db49d 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -84,7 +84,6 @@ template "/usr/local/bin/apache-latest-planet-filename" do
 end
 
 apache_module "rewrite"
 end
 
 apache_module "rewrite"

-apache_module "proxy"

 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index abed491fb7025d49c2e960e39a2e5ffe84212dbb..ab6742b01247f006cbda6cd8027164f27ae5f349 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -25,7 +25,6 @@ web_passwords = data_bag_item("web", "passwords")
 apache_module "alias"
 apache_module "expires"
 apache_module "headers"
 apache_module "alias"
 apache_module "expires"
 apache_module "headers"

-apache_module "proxy"

 apache_module "proxy_http"
 apache_module "proxy_balancer"
 apache_module "lbmethod_byrequests"
 apache_module "proxy_http"
 apache_module "proxy_balancer"
 apache_module "lbmethod_byrequests"