From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Oct 2014 11:10:38 +0000 (+0000)
Subject: RewriteLock is not needed in apache 2.4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d3f42f2199bf8098ffaf3ca2a858bc2e417ca33f?ds=sidebyside

RewriteLock is not needed in apache 2.4
---

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 1edc46fdd..706e766e8 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -79,10 +79,7 @@ directory "/store/planet/notes" do
   mode 0775
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
-end
-
+apache_module "rewrite"
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do
diff --git a/cookbooks/planet/templates/default/rewrite.conf.erb b/cookbooks/planet/templates/default/rewrite.conf.erb
deleted file mode 100644
index 32d88346e..000000000
--- a/cookbooks/planet/templates/default/rewrite.conf.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-RewriteLock /var/lock/apache2/rewrite