Puppet-lint fixes.

This commit is contained in:
Timo Mkinen 2012-07-09 14:03:53 +03:00
parent 75d1fcd4e9
commit eb0e9417ee
5 changed files with 34 additions and 28 deletions

View file

@ -7,7 +7,7 @@ class avahi::daemon {
ensure => installed,
}
if $operatingsystem == "OpenBSD" {
if $::operatingsystem == "OpenBSD" {
service { "dbus-daemon":
ensure => running,
enable => true,
@ -20,9 +20,9 @@ class avahi::daemon {
ensure => running,
enable => true,
status => "avahi-daemon -c",
start => $operatingsystem ? {
openbsd => "avahi-daemon -D",
default => undef,
start => $::operatingsystem ? {
"openbsd" => "avahi-daemon -D",
default => undef,
},
require => Package["avahi"],
}
@ -34,10 +34,10 @@ class avahi::daemon {
recurse => true,
source => "puppet:///modules/custom/empty",
mode => "0755",
owner => root,
group => $operatingsystem ? {
openbsd => wheel,
default => root,
owner => "root",
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
require => Package["avahi"],
}
@ -96,9 +96,9 @@ define avahi::service($port = "AUTO", $description = "%h", $ensure = "present",
content => template("avahi/service.erb"),
mode => "0644",
owner => root,
group => $operatingsystem ? {
openbsd => wheel,
default => root,
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
notify => Service["avahi-daemon"],
}
@ -107,8 +107,12 @@ define avahi::service($port = "AUTO", $description = "%h", $ensure = "present",
# Install avahi client support.
#
class avahi::client inherits avahi::daemon {
class avahi::client {
require avahi::daemon
package { "avahi-tools":
ensure => installed,
}
}