X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..5fde77fb90280da2c008bb5e8e83f6635b999715:/cookbooks/bind/recipes/default.rb diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb index 4dcfaa859..39f0ba2fd 100644 --- a/cookbooks/bind/recipes/default.rb +++ b/cookbooks/bind/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: bind +# Cookbook:: bind # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,53 +17,46 @@ # limitations under the License. # -include_recipe "networking" - package "bind9" -service "bind9" do +service "named" do action [:enable, :start] - supports :status => true, :restart => true, :reload => true end template "/etc/bind/named.conf.local" do source "named.local.erb" owner "root" group "root" - mode 0o644 - notifies :restart, "service[bind9]" + mode "644" + notifies :restart, "service[named]" end template "/etc/bind/named.conf.options" do source "named.options.erb" owner "root" group "root" - mode 0o644 - notifies :restart, "service[bind9]" + mode "644" + notifies :restart, "service[named]" end template "/etc/bind/db.10" do source "db.10.erb" owner "root" group "root" - mode 0o644 - notifies :reload, "service[bind9]" + mode "644" + notifies :reload, "service[named]" end firewall_rule "accept-dns-udp" do action :accept - source "net" - dest "fw" - proto "udp" + context :incoming + protocol :udp dest_ports "domain" - source_ports "-" end firewall_rule "accept-dns-tcp" do action :accept - source "net" - dest "fw" - proto "tcp:syn" + context :incoming + protocol :tcp dest_ports "domain" - source_ports "-" end