X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=3bf63d0d46fce819321eb0a61c7670d317997b96;hb=cf760168ec022b1fc8edb9c46d85b29a98af8ca6;hp=719c0e7b4b18bdc4401a1df397b15d6480135256;hpb=39000c958bd85d70d2d1b1055f8f770cabed1d90;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 719c0e7b4..3bf63d0d4 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,35 +1,64 @@
 class named {
-        include munin-node::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)"
-        }
-}
+  munin::check { 'bind': }
+
+  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 { 'dsa-bind-notrack':
+    domain      => '(ip ip6)',
+    description => 'NOTRACK for nameserver traffic',
+    table       => 'raw',
+    chain       => 'PREROUTING',
+    rule        => 'proto (tcp udp) dport 53 jump NOTRACK'
+  }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+  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',
+  }
+
+  file { '/etc/bind/named.conf.options':
+    content => template('named/named.conf.options.erb'),
+    notify  => Service['bind9'],
+  }
+
+  file { '/etc/bind/named.conf.puppet-shared-keys':
+    mode    => '0640',
+    content => template('named/named.conf.puppet-shared-keys.erb'),
+    owner   => root,
+    group   => bind,
+    notify  => Service['bind9'],
+  }
+
+  concat { '/etc/bind/named.conf.puppet-misc':
+    notify => Service['bind9'],
+  }
+  concat::fragment { 'dsa-named-conf-puppet-misc---header':
+    target  => '/etc/bind/named.conf.puppet-misc',
+    order   => '000',
+    content => @(EOF)
+      // THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+      | EOF
+  }
+}