From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 May 2016 20:24:32 +0000 (+0100)
Subject: User a2enmod so dependencies get enabled
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b64649fc306d2f8e909ffe2afb1572111590fef4?ds=inline

User a2enmod so dependencies get enabled
---

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index e824a0343..c5efdd2c5 100644
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -40,6 +40,13 @@ action :install 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"
diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0c5c235b7..82a491a89 100644
--- 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"
-apache_module "proxy"
 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 abed491fb..ab6742b01 100644
--- 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 "proxy"
 apache_module "proxy_http"
 apache_module "proxy_balancer"
 apache_module "lbmethod_byrequests"