From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 May 2016 21:17:18 +0000 (+0100)
Subject: Get rid of the last traces of old style apache auth directives
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6766749acda8c73f24cdb134f697f24942bfe50f

Get rid of the last traces of old style apache auth directives
---

diff --git a/cookbooks/apache/templates/default/info.conf.erb b/cookbooks/apache/templates/default/info.conf.erb
index fd3fb8e6f..f983b9991 100644
--- a/cookbooks/apache/templates/default/info.conf.erb
+++ b/cookbooks/apache/templates/default/info.conf.erb
@@ -4,16 +4,14 @@
 
 <Location /server-info>
     SetHandler server-info
-    Order deny,allow
-    Deny from all
 <% node.ipaddresses do |address| -%>
-    Allow from <%= address %>
+    Require ip <%= address %>
 <% end -%>
-    Allow from 127.0.1.1
-    Allow from 127.0.0.1
-    Allow from ::1
+    Require ip 127.0.1.1
+    Require ip 127.0.0.1
+    Require ip ::1
 <% @hosts.each do |host| -%>
-    Allow from <%= host %>
+    Require ip <%= host %>
 <% end -%>
 </Location>
 
diff --git a/cookbooks/apache/templates/default/status.conf.erb b/cookbooks/apache/templates/default/status.conf.erb
index 25cda1a25..6b8b98ee7 100644
--- a/cookbooks/apache/templates/default/status.conf.erb
+++ b/cookbooks/apache/templates/default/status.conf.erb
@@ -6,16 +6,14 @@ ExtendedStatus On
 
 <Location /server-status>
     SetHandler server-status
-    Order deny,allow
-    Deny from all
 <% node.ipaddresses do |address| -%>
-    Allow from <%= address %>
+    Require ip <%= address %>
 <% end -%>
-    Allow from 127.0.1.1
-    Allow from 127.0.0.1
-    Allow from ::1
+    Require ip 127.0.1.1
+    Require ip 127.0.0.1
+    Require ip ::1
 <% @hosts.each do |host| -%>
-    Allow from <%= host %>
+    Require ip <%= host %>
 <% end -%>
 </Location>
 
diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index dddd5de9f..4528f46fe 100644
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -30,8 +30,7 @@
         ProxyPass /replication/streaming http://127.0.0.1:8080
 
         <Location /replication/steaming>
-                Order deny,allow
-                Allow from all
+                Require all granted
         </Location>
 
         Redirect /pbf-experimental/	/pbf/
diff --git a/cookbooks/stats/templates/default/apache.erb b/cookbooks/stats/templates/default/apache.erb
index 328b89b78..d6e147057 100644
--- a/cookbooks/stats/templates/default/apache.erb
+++ b/cookbooks/stats/templates/default/apache.erb
@@ -16,13 +16,11 @@
 <Directory /var/lib/awstats>
 	Options None
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
 
 <Directory /usr/share/awstats/icon>
 	Options None
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 24b87902b..66d9dd837 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -47,21 +47,11 @@
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None
-<% if node[:lsb][:release].to_f >= 14.04 -%>
   Require all granted
-<% else -%>
-  Order allow,deny
-  Allow from all
-<% end -%>
 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None
-<% if node[:lsb][:release].to_f >= 14.04 -%>
   Require all granted
-<% else -%>
-  Order allow,deny
-  Allow from all
-<% end -%>
 </Directory>
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 5c149872e..b4714c137 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -174,7 +174,7 @@
   # Allow all proxy requests
   #
   <Proxy *>
-    Allow from all
+    Require all granted
   </Proxy>
 
   #