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

Puppet-lint fixes.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
autofs/manifests/init.pp
View file

@ -14,9 +14,11 @@ class autofs {
file { "/etc/auto.master": file { "/etc/auto.master":
ensure => present, ensure => present,
source => [ "puppet:///files/autofs/auto.master.${fqdn}", source => [
"puppet:///files/autofs/auto.master", "puppet:///files/autofs/auto.master.${::homename}",
"puppet:///modules/autofs/auto.master", ], "puppet:///files/autofs/auto.master",
"puppet:///modules/autofs/auto.master",
],
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",

28
avahi/manifests/init.pp
View file

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

4
gcc/manifests/init.pp
View file

@ -10,9 +10,9 @@ class gcc {
ensure => installed, ensure => installed,
} }
if $kernel == Linux { if $::kernel == Linux {
package { "kernel-headers": package { "kernel-headers":
name => $operatingsystem ? { name => $::operatingsystem ? {
"debian" => "linux-kernel-headers", "debian" => "linux-kernel-headers",
"ubuntu" => "linux-kernel-headers", "ubuntu" => "linux-kernel-headers",
default => [ "kernel-headers", "kernel-devel", ], default => [ "kernel-headers", "kernel-devel", ],

18
inetd/manifests/init.pp
View file

@ -5,15 +5,15 @@
# #
class inetd::server { class inetd::server {
case $operatingsystem { case $::operatingsystem {
centos,fedora,ubuntu,debian: { "centos","fedora","ubuntu","debian": {
include inetd::server::xinetd include inetd::server::xinetd
} }
openbsd: { "openbsd": {
include inetd::server::inetd include inetd::server::inetd
} }
default: { default: {
fail("Inetd module not supported in ${operatingsystem}") fail("Inetd module not supported in ${::operatingsystem}")
} }
} }
@ -76,8 +76,8 @@ define inetd::service($ensure = present) {
include inetd::server include inetd::server
case $operatingsystem { case $::operatingsystem {
centos,ubuntu,debian: { "centos","ubuntu","debian": {
service { $name: service { $name:
enable => $ensure ? { enable => $ensure ? {
present => true, present => true,
@ -86,7 +86,7 @@ define inetd::service($ensure = present) {
notify => Service["xinetd"], notify => Service["xinetd"],
} }
} }
fedora: { "fedora": {
augeas { "config-inetd-${name}": augeas { "config-inetd-${name}":
context => "/files/etc/xinetd.d/${name}/service", context => "/files/etc/xinetd.d/${name}/service",
changes => $ensure ? { changes => $ensure ? {
@ -96,7 +96,7 @@ define inetd::service($ensure = present) {
notify => Service["xinetd"], notify => Service["xinetd"],
} }
} }
openbsd: { "openbsd": {
exec { "enable-inetd-${name}": exec { "enable-inetd-${name}":
command => $ensure ? { command => $ensure ? {
"present" => "ruby -pi -e 'sub(/^#${name}(\\s+)/, \"${name}\\\\1\")' /etc/inetd.conf", "present" => "ruby -pi -e 'sub(/^#${name}(\\s+)/, \"${name}\\\\1\")' /etc/inetd.conf",
@ -111,7 +111,7 @@ define inetd::service($ensure = present) {
} }
} }
default: { default: {
fail("Inetd module not supported in ${operatingsystem}") fail("Inetd module not supported in ${::operatingsystem}")
} }
} }

4
netcat/manifests/init.pp
View file

@ -3,9 +3,9 @@
# #
class netcat { class netcat {
if $operatingsystem != "OpenBSD" { if $::operatingsystem != "OpenBSD" {
package { "netcat": package { "netcat":
name => $operatingsystem ? { name => $::operatingsystem ? {
"ubuntu" => "netcat", "ubuntu" => "netcat",
default => "nc", default => "nc",
}, },