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

Merge tmakinen/puppet

Browse source 
Conflicts:
	dovecot/manifests/init.pp
	libvirt/manifests/init.pp
	munin/manifests/init.pp
	puppet/manifests/init.pp
	tftp/manifests/init.pp
This commit is contained in:
Ossi Salmi 2012-11-16 19:40:31 +02:00
commit 98767cfb2a
45 changed files with 5517 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tftp/manifests/init.pp
View file

@ -82,7 +82,7 @@ class tftp::server {
}
case $::operatingsystem {
debian,ubuntu: {
"debian","ubuntu": {
service { "tftpd-hpa":
ensure => running,
hasstatus => true,
@ -91,14 +91,35 @@ class tftp::server {
Package["tftp-server"], ],
}
}
"openbsd": {
if versioncmp($::operatingsystemrelease, '5.2') < 0 {
include inetd::server
inetd::service { "tftp":
ensure => present,
require => File["/tftpboot"],
}
} else {
service { "tftpd":
ensure => running,
hasstatus => true,
enable => true,
start => "/usr/sbin/tftpd /tftpboot",
require => File["/tftpboot"],
}
}
}
default: {
include inetd::server
inetd::service { "tftp":
ensure => present,
<<<<<<< HEAD
require => $::operatingsystem ? {
"openbsd" => undef,
default => Package["tftp-server"],
},
=======
require => Package["tftp-server"],
>>>>>>> 7c4f9e6b94793caf3c9369cc0519eefddc54f7d0
}
}
}