Added support for RHEL and did some syntax cleaning

Assume that "RedHat" also works where "CentOS" does.
This commit is contained in:
Ossi Salmi 2012-09-05 16:42:02 +03:00
parent e9aae1dcf6
commit 24ecb51f6f
63 changed files with 544 additions and 497 deletions

View file

@ -2,26 +2,42 @@
#
class dns::server {
if $operatingsystem != "OpenBSD" {
package { "bind":
name => $operatingsystem ? {
"ubuntu" => "bind9",
"centos" => $operatingsystemrelease ? {
/^5\..*/ => [ "bind-chroot", "caching-nameserver", ],
default => "bind-chroot",
},
default => "bind-chroot",
case $::operatingsystem {
"centos","redhat": {
case $::operatingsystemrelease {
/^[1-5]/: {
$bind_package = [ "bind-chroot", "caching-nameserver" ]
}
default: {
$bind_package = "bind-chroot"
}
}
}
"debian","ubuntu": {
$bind_package = "bind9"
}
"openbsd": {
$bind_package = undef
}
default: {
$bind_package = "bind-chroot"
}
}
if $bind_package {
package { "bind":
ensure => installed,
name => $bind_package,
}
}
# first set per os paths
case $operatingsystem {
case $::operatingsystem {
"fedora": {
$confdir = "/etc/named"
}
"centos": {
case $operatingsystemrelease {
"centos","redhat": {
case $::operatingsystemrelease {
/^5\..*/: {
$chroot = "/var/named/chroot"
}
@ -53,7 +69,7 @@ class dns::server {
$chroot = ""
}
case $operatingsystem {
case $::operatingsystem {
"ubuntu": {
$group = "bind"
}
@ -67,7 +83,7 @@ class dns::server {
mode => "0640",
owner => "root",
group => $group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -92,18 +108,18 @@ class dns::server {
}
service { "named":
name => $operatingsystem ? {
name => $::operatingsystem ? {
"ubuntu" => "bind9",
default => "named",
},
ensure => running,
enable => true,
status => "/usr/sbin/rndc status",
stop => $operatingsystem ? {
stop => $::operatingsystem ? {
"openbsd" => "pkill -u named",
default => undef,
},
start => $operatingsystem ? {
start => $::operatingsystem ? {
"openbsd" => "/usr/sbin/named",
default => undef,
},
@ -116,7 +132,7 @@ class dns::server {
mode => "0640",
owner => "root",
group => $group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -127,7 +143,7 @@ class dns::server {
content => template("dns/generate-named-conf.sh.erb"),
mode => "0755",
owner => "root",
group => $operatingsystem ? {
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
@ -150,7 +166,7 @@ class dns::server {
mode => "0640",
owner => "root",
group => $group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -165,7 +181,7 @@ class dns::server {
mode => "0640",
owner => "root",
group => $group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -189,7 +205,7 @@ class dns::server::ldap inherits dns::server {
source => "puppet:///modules/dns/dnsdump.py",
mode => 0755,
owner => root,
group => $operatingsystem ? {
group => $::operatingsystem ? {
OpenBSD => wheel,
default => root,
},
@ -250,11 +266,11 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
case $role {
"master": {
case $operatingsystem {
case $::operatingsystem {
"openbsd": {
$zonedir = "/master/${view}"
}
"fedora","centos": {
"fedora","centos","redhat": {
$zonedir = "/var/named/${view}"
}
"ubuntu": {
@ -266,11 +282,11 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
if $key == "none" {
fail("No key defined for dns::zone '${name}'")
}
case $operatingsystem {
case $::operatingsystem {
"openbsd": {
$zonedir = "/dynamic/${view}"
}
"fedora","centos": {
"fedora","centos","redhat": {
$zonedir = "/var/named/dynamic/${view}"
}
"ubuntu": {
@ -282,11 +298,11 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
if $master == "" {
fail("No master defined for dns::zone '${name}'")
}
case $operatingsystem {
case $::operatingsystem {
"openbsd": {
$zonedir = "/slave/${view}"
}
"fedora","centos": {
"fedora","centos","redhat": {
$zonedir = "/var/named/slaves/${view}"
}
"ubuntu": {
@ -341,7 +357,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640",
owner => "root",
group => $dns::server::group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -356,7 +372,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640",
owner => "root",
group => $dns::server::group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -369,7 +385,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640",
owner => "root",
group => $dns::server::group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -384,7 +400,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640",
owner => "root",
group => $dns::server::group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -399,7 +415,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0640",
owner => "root",
group => $dns::server::group,
require => $operatingsystem ? {
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["bind"],
},
@ -438,7 +454,7 @@ class dns::nsupdate {
content => template("dns/nsupdate.sh.erb"),
mode => "0700",
owner => root,
group => $operatingsystem ? {
group => $::operatingsystem ? {
openbsd => wheel,
default => root,
},