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

dns: Fix package depencies from dns::zone.

Browse source
This commit is contained in:
Timo Makinen 2015-11-23 14:27:12 +02:00
parent 7c5aef3101
commit 402c6e37f9
1 changed files with 14 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
dns/manifests/init.pp
View file

@ -38,6 +38,9 @@ class dns::server {
ensure => installed, ensure => installed,
name => $bind_package, name => $bind_package,
} }
$package_require = Package["bind"]
} else {
$package_require = undef
} }
# first set per os paths # first set per os paths
@ -133,10 +136,7 @@ class dns::server {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
require => $bind_package ? { require => $package_require,
undef => undef,
default => Package["bind"],
},
} }
exec { "rndc-confgen": exec { "rndc-confgen":
command => $chroot ? { command => $chroot ? {
@ -180,10 +180,7 @@ class dns::server {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
require => $bind_package ? { require => $package_require,
undef => undef,
default => Package["bind"],
},
notify => Exec["generate-named-conf"], notify => Exec["generate-named-conf"],
} }
file { "/usr/local/sbin/generate-named-conf.sh": file { "/usr/local/sbin/generate-named-conf.sh":
@ -214,10 +211,7 @@ class dns::server {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
require => $bind_package ? { require => $package_require,
undef => undef,
default => Package["bind"],
},
notify => Exec["named-checkconf"], notify => Exec["named-checkconf"],
} }
@ -229,10 +223,7 @@ class dns::server {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
require => $bind_package ? { require => $package_require,
undef => undef,
default => Package["bind"],
},
notify => Exec["named-checkconf"], notify => Exec["named-checkconf"],
} }
} }
@ -410,10 +401,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"master" => File["${dns::server::chroot}${zonedir}/db.${zonefile}"], "master" => File["${dns::server::chroot}${zonedir}/db.${zonefile}"],
default => undef, default => undef,
}, },
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
} }
} }
} }
@ -424,10 +412,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
notify => Exec["generate-named-conf"], notify => Exec["generate-named-conf"],
} }
@ -439,10 +424,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
notify => Exec["generate-named-conf"], notify => Exec["generate-named-conf"],
} }
} else { } else {
@ -459,10 +441,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
backup => false, backup => false,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
notify => Exec["named-checkconf"], notify => Exec["named-checkconf"],
} }
@ -471,10 +450,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
notify => Exec["named-checkconf"], notify => Exec["named-checkconf"],
} }
file { "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d": file { "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d":
@ -482,10 +458,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
purge => true, purge => true,
force => true, force => true,
recurse => true, recurse => true,
@ -503,10 +476,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
require => $::operatingsystem ? { require => $::dns::server::package_require,
"openbsd" => undef,
default => Package["bind"],
},
notify => Exec["named-checkconf"], notify => Exec["named-checkconf"],
} }