Merge interface families

[chef.git] / cookbooks / apache / templates / default / info.conf.erb

diff --git a/cookbooks/apache/templates/default/info.conf.erb b/cookbooks/apache/templates/default/info.conf.erb
index fd3fb8e6f7e594ff693b42d7ae6fe08d8660a7d5..a8a303a9fe61e25b697b035c0972d421817cfcd2 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 %>
+<% node.ipaddresses.sort.each do |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>