Drop tcp vs tcp:syn distinction

[chef.git] / cookbooks / bind / recipes / default.rb

diff --git a/cookbooks/bind/recipes/default.rb b/cookbooks/bind/recipes/default.rb
index 77c777e1a19e05d27babf440798f58e8639a8417..6c596420de79e514c3ac0af10886f6d2b197c01f 100644 (file)
--- a/cookbooks/bind/recipes/default.rb
+++ b/cookbooks/bind/recipes/default.rb
@@ -31,13 +31,7 @@ end.flatten
 
 package "bind9"
 
-service_name = if node[:lsb][:release].to_f < 20.04
-                 "bind9"
-               else
-                 "named"
-               end
-
-service service_name do
+service "named" do
   action [:enable, :start]
 end
 
@@ -46,7 +40,7 @@ template "/etc/bind/named.conf.local" do
   owner "root"
   group "root"
   mode "644"
-  notifies :restart, "service[#{service_name}]"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/named.conf.options" do
@@ -55,7 +49,7 @@ template "/etc/bind/named.conf.options" do
   group "root"
   mode "644"
   variables :ipv4_clients => ipv4_clients, :ipv6_clients => ipv6_clients
-  notifies :restart, "service[#{service_name}]"
+  notifies :restart, "service[named]"
 end
 
 template "/etc/bind/db.10" do
@@ -63,7 +57,7 @@ template "/etc/bind/db.10" do
   owner "root"
   group "root"
   mode "644"
-  notifies :reload, "service[#{service_name}]"
+  notifies :reload, "service[named]"
 end
 
 firewall_rule "accept-dns-udp" do
@@ -72,14 +66,12 @@ firewall_rule "accept-dns-udp" do
   dest "fw"
   proto "udp"
   dest_ports "domain"
-  source_ports "-"
 end
 
 firewall_rule "accept-dns-tcp" do
   action :accept
   source "net"
   dest "fw"
-  proto "tcp:syn"
+  proto "tcp"
   dest_ports "domain"
-  source_ports "-"
 end