switch weblogsync to other ssh facter

[mirror/dsa-puppet.git] / modules / named / manifests / init.pp

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index a2dde9d..361ffaa 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,13 +1,6 @@
 class named {
-
        munin::check { 'bind': }
 
-       site::aptrepo { 'bind-ratelimit':
-               url        => 'http://db.debian.org/debian-admin',
-               suite      => 'bind-ratelimit',
-               components => 'main',
-       }
-
        package { 'bind9':
                ensure => installed
        }
@@ -16,19 +9,13 @@ class named {
                ensure => running,
        }
 
-       @ferm::rule { 'dsa-bind-no-ddos-any':
+       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':
-               domain      => '(ip ip6)',
-               description => 'Allow nameserver access',
-               rule        => '&TCP_UDP_SERVICE(53)'
-       }
-
-       @ferm::rule { 'dsa-bind-notrack':
+       ferm::rule { 'dsa-bind-notrack':
                domain      => '(ip ip6)',
                description => 'NOTRACK for nameserver traffic',
                table       => 'raw',
@@ -36,7 +23,7 @@ class named {
                rule        => 'proto (tcp udp) dport 53 jump NOTRACK'
        }
 
-       @ferm::rule { 'dsa-bind-notrack-out':
+       ferm::rule { 'dsa-bind-notrack-out':
                domain      => '(ip ip6)',
                description => 'NOTRACK for nameserver traffic',
                table       => 'raw',
@@ -50,4 +37,28 @@ class named {
                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
+       }
 }