X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=a9a200f1ec092296f4673e1972d4c72496e39159;hb=7e4f6aa823f850e0deb757b813227bc5b81b88c9;hp=9c4b82b1a71717522df53841a5a50eb77a80485f;hpb=446a74676ae69d25525215b8f57158d71e5a47f6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 9c4b82b1a..a9a200f1e 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,35 +1,41 @@
 class named {
-        include munin-node::bind
 
-        package {
-                bind9: ensure => installed;
-        }
+	munin::check { 'bind': }
 
-        exec {
-                "bind9 restart":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        exec {
-                "bind9 reload":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        file {
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
-        }
-        ferm::rule { "dsa-bind":
-                domain          => (ip ip6),
-                description     => "Allow nameserver access",
-                rule            => "proto (udp tcp) mod state state (NEW) dport (53) ACCEPT"
-        }
-}
+	package { 'bind9':
+		ensure => installed
+	}
+
+	service { 'bind9':
+		ensure => running,
+	}
+
+	@ferm::rule { 'dsa-bind':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => '&TCP_UDP_SERVICE(53)'
+	}
 
-# vim: set fdm=marker ts=8 sw=8 et:
+	@ferm::rule { 'dsa-bind-notrack':
+		domain      => '(ip ip6)',
+		description => 'NOTRACK for nameserver traffic',
+		table       => 'raw',
+		chain       => 'PREROUTING',
+		rule        => 'proto (tcp udp) dport 53 jump NOTRACK'
+	}
+
+	@ferm::rule { 'dsa-bind-notrack-out':
+		domain      => '(ip ip6)',
+		description => 'NOTRACK for nameserver traffic',
+		table       => 'raw',
+		chain       => 'OUTPUT',
+		rule        => 'proto (tcp udp) sport 53 jump NOTRACK'
+	}
+
+	file { '/var/log/bind9':
+		ensure => directory,
+		owner  => bind,
+		group  => bind,
+		mode   => '0775',
+	}
+}