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 fd3fb8e6f7e594ff693b42d7ae6fe08d8660a7d5..f983b9991da32f96eafd5f56268e1095f590333a 100644 (file)
--- 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 25cda1a25651961ae59bc9bad6e7cfd83281094a..6b8b98ee7f8e19b13b2f6cab289ae46fd2a665b9 100644 (file)
--- 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 dddd5de9fdfe55bdbc1bf985263e5eeda39ea4c0..4528f46fef8ace583339f0ea9e5bf7c2b4001466 100644 (file)
--- 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 328b89b784f83e46d54e43237639331343e1917e..d6e1470574ef628b52c8b8991830b5d10204f216 100644 (file)
--- 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 24b87902bca4ca8845e64767fe71186d2454c388..66d9dd83709253b541e0ba9e0907b329b2ce2a62 100644 (file)
--- 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 5c149872e9f63c8097fc6d1ce97cba59184c6a33..b4714c1372abfeabbd36a84bcfc2d2ae39466e50 100644 (file)
--- 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>
 
   #