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

Removed support for OpenBSD < 4.9

Browse source
This commit is contained in:
Ossi Salmi 2013-05-04 16:33:46 +03:00
parent 93906963d9
commit e8b2422265
7 changed files with 55 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

79
dhcp/manifests/init.pp
View file

@ -27,38 +27,38 @@ class dhcp::server::common {
package { "dhcp":
name => $::operatingsystem ? {
Debian => "dhcp3-server",
OpenBSD => "isc-dhcp-server",
Ubuntu => "dhcp3-server",
default => "dhcp",
"debian" => "dhcp3-server",
"ubuntu" => "dhcp3-server",
"openbsd" => "isc-dhcp-server",
default => "dhcp",
},
ensure => installed,
}
file { "dhcpd.leases":
name => $::operatingsystem ? {
Debian => "/var/lib/dhcp3/dhcpd.leases",
OpenBSD => "/var/db/dhcpd.leases",
Ubuntu => "/var/lib/dhcp3/dhcpd.leases",
default => "/var/lib/dhcpd/dhcpd.leases",
"debian" => "/var/lib/dhcp3/dhcpd.leases",
"ubuntu" => "/var/lib/dhcp3/dhcpd.leases",
"openbsd" => "/var/db/dhcpd.leases",
default => "/var/lib/dhcpd/dhcpd.leases",
},
ensure => present,
owner => $::operatingsystem ? {
debian => dhcpd,
ubuntu => dhcpd,
default => root,
"debian" => "dhcpd",
"ubuntu" => "dhcpd",
default => "root",
},
group => $::operatingsystem ? {
Debian => dhcpd,
OpenBSD => wheel,
Ubuntu => dhcpd,
default => root,
"debian" => "dhcpd",
"ubuntu" => "dhcpd",
"openbsd" => "wheel",
default => "root",
},
require => Package["dhcp"],
before => Service["dhcpd"],
}
if $::operatingsystem == "OpenBSD" and $::operatingsystemrelease !~ /4\.[1-8]/ {
if $::operatingsystem == "OpenBSD" {
file { "/etc/rc.d/isc_dhcpd":
ensure => present,
mode => "0555",
@ -71,26 +71,23 @@ class dhcp::server::common {
service { "dhcpd":
name => $::operatingsystem ? {
Debian => "dhcp3-server",
OpenBSD => $::operatingsystemrelease ? {
/4\.[1-8]/ => "isc-dhcpd",
default => "isc_dhcpd",
},
Ubuntu => "dhcp3-server",
default => "dhcpd",
"debian" => "dhcp3-server",
"ubuntu" => "dhcp3-server",
"openbsd" => "isc_dhcpd",
default => "dhcpd",
},
ensure => running,
enable => true,
binary => $::operatingsystem ? {
OpenBSD => "/usr/local/sbin/dhcpd",
default => undef,
"openbsd" => "/usr/local/sbin/dhcpd",
default => undef,
},
start => $::operatingsystem ? {
OpenBSD => $dhcp_server_interface ? {
"openbsd" => $dhcp_server_interface ? {
"" => "/usr/local/sbin/dhcpd -q",
default => "/usr/local/sbin/dhcpd -q ${dhcp_server_interface}",
},
default => undef,
default => undef,
},
require => Package["dhcp"],
}
@ -132,10 +129,10 @@ class dhcp::server inherits dhcp::server::common {
source => [ "puppet:///files/dhcp/dhcpd.conf.${fqdn}",
"puppet:///files/dhcp/dhcpd.conf", ],
mode => "0644",
owner => root,
owner => "root",
group => $::operatingsystem ? {
openbsd => wheel,
default => root,
"openbsd" => "wheel",
default => "root",
},
notify => Service["dhcpd"],
}
@ -159,10 +156,10 @@ class dhcp::server::ldap inherits dhcp::server::common {
ensure => present,
source => "puppet:///modules/dhcp/dhcpdump.py",
mode => "0755",
owner => root,
owner => "root",
group => $::operatingsystem ? {
OpenBSD => wheel,
default => root,
"openbsd" => "wheel",
default => "root",
},
}
@ -172,10 +169,10 @@ class dhcp::server::ldap inherits dhcp::server::common {
source => [ "puppet:///files/dhcp/dhcpd.conf.in.${hostname}",
"puppet:///files/dhcp/dhcpd.conf.in", ],
mode => "0644",
owner => root,
owner => "root",
group => $::operatingsystem ? {
OpenBSD => wheel,
default => root,
"openbsd" => "wheel",
default => "root",
},
require => Package["dhcp"],
}
@ -211,18 +208,18 @@ class dhcp::server::ldap inherits dhcp::server::common {
# dhcp::relay { "relay0": interface => "em2", server_addr => "10.20.110.11" }
#
define dhcp::relay ($interface, $server_addr) {
define dhcp::relay($interface, $server_addr) {
service { $name:
name => $name,
ensure => running,
provider => "base",
hasrestart => false,
hasstatus => false,
pattern => "/usr/sbin/dhcrelay -i ${interface} ${server_addr}",
start => $::operatingsystem ? {
OpenBSD => "/usr/sbin/dhcrelay -i ${interface} ${server_addr}",
default => undef,
"openbsd" => "/usr/sbin/dhcrelay -i ${interface} ${server_addr}",
default => undef,
}
}
}
}