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

Merge branch 'master' into puppet3

Browse source
This commit is contained in:
Ossi Salmi 2013-05-08 00:28:29 +03:00
commit c8c5f097b4
12 changed files with 605 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

35
dns/manifests/init.pp
View file

@ -78,6 +78,39 @@ class dns::server {
}
}
if ! $::ipaddress6 {
$options = $::operatingsystem ? {
"debian" => "-u bind -4",
"ubuntu" => "-u bind -4",
default => "-4",
}
} else {
$options = $::operatingsystem ? {
"debian" => "-u bind",
"ubuntu" => "-u bind",
default => "",
}
}
case $::operatingsystem {
"debian", "ubuntu": {
augeas { "set-named-default":
context => "/files/etc/default/named",
changes => "set OPTIONS '${options}'",
notify => Service["named"],
require => Package["bind"],
}
}
"fedora","centos","redhat": {
augeas { "set-named-sysconfig":
context => "/files/etc/sysconfi/named",
changes => "set OPTIONS '${options}'",
notify => Service["named"],
require => Package["bind"],
}
}
}
file { "${chroot}${rndckey}":
ensure => present,
mode => "0640",
@ -130,7 +163,7 @@ class dns::server {
default => undef,
},
start => $::operatingsystem ? {
"openbsd" => "/usr/sbin/named",
"openbsd" => "/usr/sbin/named ${options}",
default => undef,
},
}