projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
99builddsourceslist: remove jessie-kfreebsd hacks
[mirror/dsa-puppet.git]
/
modules
/
named
/
manifests
/
init.pp
diff --git
a/modules/named/manifests/init.pp
b/modules/named/manifests/init.pp
index
da2313c
..
f731dff
100644
(file)
--- a/
modules/named/manifests/init.pp
+++ b/
modules/named/manifests/init.pp
@@
-2,9
+2,10
@@
class named {
munin::check { 'bind': }
site::aptrepo { 'bind-ratelimit':
munin::check { 'bind': }
site::aptrepo { 'bind-ratelimit':
- url => 'http://db.debian.org/debian-admin',
- suite => 'bind-ratelimit',
- components => 'main',
+ ensure => absent,
+ #url => 'http://db.debian.org/debian-admin',
+ #suite => 'bind-ratelimit',
+ #components => 'main',
}
package { 'bind9':
}
package { 'bind9':
@@
-21,16
+22,16
@@
class named {
rule => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
}
rule => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
}
- if
getfromhash($site::nodeinfo,
'dns_primary') {
+ if
has_role(
'dns_primary') {
@ferm::rule { '01-dsa-bind-4':
domain => '(ip)',
description => 'Allow nameserver access',
@ferm::rule { '01-dsa-bind-4':
domain => '(ip)',
description => 'Allow nameserver access',
- rule => '&
SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4
)',
+ rule => '&
TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO_V4 $HOST_NAGIOS_V4 $HOST_RCODE0_V4 $HOST_EASYDNS_V4 $HOST_NETNOD_V4 5.153.231.21 )
)',
}
@ferm::rule { '01-dsa-bind-6':
domain => '(ip6)',
description => 'Allow nameserver access',
}
@ferm::rule { '01-dsa-bind-6':
domain => '(ip6)',
description => 'Allow nameserver access',
- rule => '&
SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6
)',
+ rule => '&
TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO_V6 $HOST_NAGIOS_V6 $HOST_RCODE0_V6 $HOST_NETNOD_V6 2001:41c8:1000:21::21:21 )
)',
}
} else {
@ferm::rule { '01-dsa-bind':
}
} else {
@ferm::rule { '01-dsa-bind':
@@
-62,4
+63,12
@@
class named {
group => bind,
mode => '0775',
}
group => bind,
mode => '0775',
}
+
+ 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'],
+ }
}
}