X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=9f1c7f908faee7a6a6a200863eaae1d693f390ea;hb=206524a32e769b40cd66b33b5468d3a64a9b5b4a;hp=b5233758f7d6fd30a6f7927440d3241168cdbe09;hpb=cab61105c047ee9d4f521b65eaebf1e0f6e9e736;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index b5233758f..9f1c7f908 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,37 +1,53 @@
 class named {
-        activate_munin_check {
-                "bind":;
-        }
-
-        package {
-                bind9: ensure => installed;
-        }
-
-        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            => "&TCP_UDP_SERVICE(53)"
-        }
-}
 
-# vim: set fdm=marker ts=8 sw=8 et:
+	munin::check { 'bind': }
+
+	site::aptrepo { 'bind-ratelimit':
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => 'bind-ratelimit',
+		components => 'main',
+	}
+
+	package { 'bind9':
+		ensure => installed
+	}
+
+	service { 'bind9':
+		ensure => running,
+	}
+
+	@ferm::rule { '00-dsa-bind-no-ddos-any':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
+	}
+
+	@ferm::rule { '01-dsa-bind':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => '&TCP_UDP_SERVICE(53)'
+	}
+
+	@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',
+	}
+}