Get rid of the last traces of old style apache auth directives
authorTom Hughes <tom@compton.nu>
Fri, 6 May 2016 21:17:18 +0000 (22:17 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 6 May 2016 21:17:18 +0000 (22:17 +0100)
cookbooks/apache/templates/default/info.conf.erb
cookbooks/apache/templates/default/status.conf.erb
cookbooks/planet/templates/default/apache.erb
cookbooks/stats/templates/default/apache.erb
cookbooks/tile/templates/default/apache.erb
cookbooks/web/templates/default/apache.frontend.erb

index fd3fb8e..f983b99 100644 (file)
@@ -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>
 
index 25cda1a..6b8b98e 100644 (file)
@@ -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>
 
index dddd5de..4528f46 100644 (file)
@@ -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/
index 328b89b..d6e1470 100644 (file)
 <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>
index 24b8790..66d9dd8 100644 (file)
 <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>
index 5c14987..b4714c1 100644 (file)
   # Allow all proxy requests
   #
   <Proxy *>
-    Allow from all
+    Require all granted
   </Proxy>
 
   #