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

Fix lint warnings about ensure placement

Browse source
This commit is contained in:
Ossi Salmi 2015-05-04 11:00:36 +03:00
parent a8ebd9417c
commit 96fb1bacbc
21 changed files with 53 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nagios/manifests/init.pp
View file

@ -50,8 +50,8 @@ class nagios::common {
class nagios::server::manual inherits nagios::common {
package { "nagios":
name => $package,
ensure => installed,
name => $package,
}
case $::operatingsystem {
@ -84,9 +84,9 @@ class nagios::server::manual inherits nagios::common {
}
service { "nagios":
name => $service,
ensure => running,
enable => true,
name => $service,
hasstatus => true,
}
@ -113,8 +113,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/nagios.cfg":
name => "${etcdir}/nagios.cfg",
ensure => present,
name => "${etcdir}/nagios.cfg",
mode => "0644",
owner => "root",
group => "root",
@ -124,8 +124,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/cgi.cfg":
name => "${etcdir}/cgi.cfg",
ensure => present,
name => "${etcdir}/cgi.cfg",
mode => "0644",
owner => "root",
group => "root",
@ -135,8 +135,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/commands.cfg":
name => "${etcdir}/commands.cfg",
ensure => present,
name => "${etcdir}/commands.cfg",
mode => "0644",
owner => "root",
group => "root",
@ -146,8 +146,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/passwd":
name => $htpasswd,
ensure => present,
name => $htpasswd,
mode => "0640",
owner => "root",
group => $apache::sslserver::group,
@ -155,8 +155,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/conf.d":
name => $confdir,
ensure => directory,
name => $confdir,
mode => "0640",
owner => "root",
group => "nagios",
@ -169,8 +169,8 @@ class nagios::server::manual inherits nagios::common {
}
file { "/etc/nagios/private.d":
name => $private,
ensure => directory,
name => $private,
mode => "0640",
owner => "root",
group => "nagios",

8
nagios/manifests/target.pp
View file

@ -433,13 +433,13 @@ class nagios::target::nrpe inherits nagios::target {
}
package { "nrpe":
name => $package,
ensure => installed,
name => $package,
}
file { "/etc/nrpe.cfg":
name => $nrpecfg,
ensure => present,
name => $nrpecfg,
mode => "0644",
owner => "root",
group => $::operatingsystem ? {
@ -452,8 +452,8 @@ class nagios::target::nrpe inherits nagios::target {
}
file { "/etc/nrpe.d":
name => $nrpedir,
ensure => directory,
name => $nrpedir,
mode => "0644",
owner => "root",
group => $::operatingsystem ? {
@ -468,9 +468,9 @@ class nagios::target::nrpe inherits nagios::target {
}
service { "nrpe":
name => $service,
ensure => running,
enable => true,
name => $service,
}
nagios::target::nrpe::service { "check_disk -w 10% -c 5% -p /":