tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dns: Fix tag conflicts in dns::node

Browse source
This commit is contained in:
Ossi Salmi 2013-10-31 10:27:22 +02:00
parent bd6b4c1e8a
commit e3c9faac6a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dns/manifests/init.pp
View file

@ -513,13 +513,13 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
notify => Service["named"], notify => Service["named"],
} }
Dns::Node::Record <<| tag == $zone |>> { Dns::Node::Record <<| tag == "dnsrec-${zone}" |>> {
dbdir => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d", dbdir => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d",
notify => Exec["update-db.${zonefile}-dynamic"], notify => Exec["update-db.${zonefile}-dynamic"],
require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic", require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic",
"${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d"], "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d"],
} }
Dns::Node::Record::Reverse <<| tag == $zone |>> { Dns::Node::Record::Reverse <<| tag == "dnsptr-${zone}" |>> {
dbdir => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d", dbdir => "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d",
notify => Exec["update-db.${zonefile}-dynamic"], notify => Exec["update-db.${zonefile}-dynamic"],
require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic", require => File["${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic",
@ -579,7 +579,7 @@ class dns::node {
ipaddr => $dns_node_ipaddr, ipaddr => $dns_node_ipaddr,
host => $dns_node_name, host => $dns_node_name,
cname => $dns_node_cname, cname => $dns_node_cname,
tag => $dns_node_zone tag => "dnsrec-${dns_node_zone}",
} }
$dns_node_class = inline_template("<%= @dns_node_netmask.scan('255.').length -%>") $dns_node_class = inline_template("<%= @dns_node_netmask.scan('255.').length -%>")
@ -589,7 +589,7 @@ class dns::node {
@@dns::node::record::reverse { "${dns_node_name}.${dns_node_zone}": @@dns::node::record::reverse { "${dns_node_name}.${dns_node_zone}":
ipaddr => $dns_node_raddr, ipaddr => $dns_node_raddr,
host => "${dns_node_name}.${dns_node_zone}", host => "${dns_node_name}.${dns_node_zone}",
tag => $dns_node_rzone tag => "dnsptr-${dns_node_rzone}",
} }
} }