Simplify named configuration

diff --git a/cookbooks/bind/attributes/default.rb b/cookbooks/bind/attributes/default.rb
deleted file mode 100644 (file)
index 9ebc921..0000000
--- a/cookbooks/bind/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-default[:bind] = {}

diff --git a/cookbooks/bind/metadata.rb b/cookbooks/bind/metadata.rb
index b7d5437a14639f589172f6db821be8d204438d94..c3e00d349be963f0df1915ca116ae967e30d0fbd 100644 (file)
--- a/cookbooks/bind/metadata.rb
+++ b/cookbooks/bind/metadata.rb
@@ -6,4 +6,3 @@ description       "Configures bind"
 
 version           "1.0.0"
 supports          "ubuntu"
 
 version           "1.0.0"
 supports          "ubuntu"

-depends           "networking"

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 10ab7ce0bba31b4f89e205b361e57bf6f3ca5fc3..39f0ba2fddb1753170f151395c009272f748fdd6 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -17,18 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "networking"
-
-clients = search(:node, "roles:#{node[:bind][:clients]}")
-
-ipv4_clients = clients.collect do |client|
-  client.ipaddresses(:family => :inet)
-end.flatten
-
-ipv6_clients = clients.collect do |client|
-  client.ipaddresses(:family => :inet6)
-end.flatten
-

 package "bind9"
 
 service "named" do
 package "bind9"
 
 service "named" do


@@ -48,7 +36,6 @@ template "/etc/bind/named.conf.options" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients

   notifies :restart, "service[named]"
 end
 
   notifies :restart, "service[named]"
 end
 

diff --git a/cookbooks/bind/templates/default/named.options.erb b/cookbooks/bind/templates/default/named.options.erb
index 2ec4094dc8bb65d12e3b0924fff3af9c65872a24..ac4f32303267938744df6076b0ca39179fc13e8e 100644 (file)
--- a/cookbooks/bind/templates/default/named.options.erb
+++ b/cookbooks/bind/templates/default/named.options.erb
@@ -1,38 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-acl "osm" {
-       127.0.0.1/32;
-<% node.interfaces(:family => :inet).each do |interface| -%>
-        <%= interface[:network] %>/<%= interface[:prefix] %>;
-<% end -%>
-<% @ipv4_clients.sort.each do |address| -%>
-       <%= address %>/32;
-<% end -%>
-
-       ::1/128;
-<% node.interfaces(:family => :inet6).each do |interface| -%>
-        <%= interface[:network] %>/<%= interface[:prefix] %>;
-<% end -%>
-<% @ipv6_clients.sort.each do |address| -%>
-       <%= address %>/128;
-<% end -%>
-};
-

 options {
         # Directory to use for any working files
        directory "/var/cache/bind";
 
 options {
         # Directory to use for any working files
        directory "/var/cache/bind";
 

-<% if node[:bind][:forwarders] -%>
-       # Forward any queries we can't answer
-       forwarders {
-<% node[:bind][:forwarders].each do |forwarder| -%>
-               <%= forwarder %>;
-<% end -%>
-       };
-<% end -%>
-

        # Only allow queries from our machines
        # Only allow queries from our machines

-       allow-query { osm; };
+       allow-query { localnets; };

 
        # Don't allow transfers
        allow-transfer { none; };
 
        # Don't allow transfers
        allow-transfer { none; };

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 6a77bf6e140f7ea166d9a24ca0c39a7a42ffb856..2851687d47a7148bf929db1cac2d8a20f88461bc 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,9 +2,6 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
 description "Master role applied to fafnir"
 
 default_attributes(

-  :bind => {
-    :clients => "equinix-dub"
-  },

   :dhcpd => {
     :first_address => "10.0.79.1",
     :last_address => "10.0.79.254"
   :dhcpd => {
     :first_address => "10.0.79.1",
     :last_address => "10.0.79.254"

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index eb6ff6c53bbb54567aab26eff6647eaf06392f4e..e4ea23262cad50674630caf5cd9d547d5b7f4482 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,9 +2,6 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
 description "Master role applied to ironbelly"
 
 default_attributes(

-  :bind => {
-    :clients => "equinix-ams"
-  },

   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"
   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 9b4b1f93c8c32385de12e29971bf3f69f91ceeef..804aace16007a3b213a04de8f3714ed756b6e908 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -12,9 +12,6 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
       :max_connections_per_child => 10000
     }
   },

-  :bind => {
-    :clients => "ucl"
-  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"