Merge tmakinen/puppet

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

View file

@ -50,7 +50,7 @@ class inetd::server::inetd {
service { "inetd":
ensure => running,
start => "inetd",
start => "/usr/sbin/inetd",
enable => true,
}