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

Fixes for nagios dependencies and permissions

Browse source
This commit is contained in:
Ossi Salmi 2012-11-04 02:56:21 +02:00
parent 59ed1ced8f
commit b64f7ea19a
1 changed files with 57 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

106
nagios/manifests/init.pp
View file

@ -103,23 +103,23 @@ class nagios::server {
file { "/etc/nagios/conf.d": file { "/etc/nagios/conf.d":
name => $confdir, name => $confdir,
ensure => directory, ensure => directory,
mode => "0640",
owner => "root",
group => "nagios",
purge => true, purge => true,
force => true, force => true,
recurse => true, recurse => true,
owner => "root",
group => "root",
mode => "0644",
source => "puppet:///modules/custom/empty", source => "puppet:///modules/custom/empty",
require => Package["nagios"], require => Package["nagios"],
notify => Service["nagios"],
} }
file { "${confdir}/contactgroup_all.cfg": file { "${confdir}/contactgroup_all.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Contactgroup["all"], before => Nagios_Contactgroup["all"],
require => File["/etc/nagios/conf.d"],
} }
nagios_contactgroup { "all": nagios_contactgroup { "all":
target => "${confdir}/contactgroup_all.cfg", target => "${confdir}/contactgroup_all.cfg",
@ -128,11 +128,12 @@ class nagios::server {
} }
file { "${confdir}/host_default.cfg": file { "${confdir}/host_default.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Host["default"], before => Nagios_Host["default"],
require => File["/etc/nagios/conf.d"],
} }
nagios_host { "default": nagios_host { "default":
target => "${confdir}/host_default.cfg", target => "${confdir}/host_default.cfg",
@ -154,11 +155,12 @@ class nagios::server {
} }
file { "${confdir}/service_default.cfg": file { "${confdir}/service_default.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Service["default"], before => Nagios_Service["default"],
require => File["/etc/nagios/conf.d"],
} }
nagios_service { "default": nagios_service { "default":
target => "${confdir}/service_default.cfg", target => "${confdir}/service_default.cfg",
@ -188,11 +190,12 @@ class nagios::server {
} }
file { "${confdir}/timeperiod_24x7.cfg": file { "${confdir}/timeperiod_24x7.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Timeperiod["24x7"], before => Nagios_Timeperiod["24x7"],
require => File["/etc/nagios/conf.d"],
} }
nagios_timeperiod { "24x7": nagios_timeperiod { "24x7":
target => "${confdir}/timeperiod_24x7.cfg", target => "${confdir}/timeperiod_24x7.cfg",
@ -222,11 +225,12 @@ class nagios::server {
define nagios::contact::email($confdir=$nagios::server::confdir) { define nagios::contact::email($confdir=$nagios::server::confdir) {
file { "${confdir}/contact_${name}.cfg": file { "${confdir}/contact_${name}.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Contact[$name], before => Nagios_Contact[$name],
require => File["/etc/nagios/conf.d"],
} }
nagios_contact { $name: nagios_contact { $name:
target => "${confdir}/contact_${name}.cfg", target => "${confdir}/contact_${name}.cfg",
@ -246,11 +250,12 @@ define nagios::contact::email($confdir=$nagios::server::confdir) {
define nagios::contact::prowl($confdir=$nagios::server::confdir) { define nagios::contact::prowl($confdir=$nagios::server::confdir) {
file { "${confdir}/contact_${name}.cfg": file { "${confdir}/contact_${name}.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Contact[$name], before => Nagios_Contact[$name],
require => File["/etc/nagios/conf.d"],
} }
nagios_contact { $name: nagios_contact { $name:
target => "${confdir}/contact_${name}.cfg", target => "${confdir}/contact_${name}.cfg",
@ -270,11 +275,12 @@ define nagios::contact::prowl($confdir=$nagios::server::confdir) {
define nagios::host($confdir, $operatingsystem) { define nagios::host($confdir, $operatingsystem) {
file { "${confdir}/host_${name}.cfg": file { "${confdir}/host_${name}.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Host[$name], before => Nagios_Host[$name],
require => File["/etc/nagios/conf.d"],
} }
nagios_host { $name: nagios_host { $name:
ensure => present, ensure => present,
@ -283,11 +289,12 @@ define nagios::host($confdir, $operatingsystem) {
} }
# file { "${confdir}/hostextinfo_${name}.cfg": # file { "${confdir}/hostextinfo_${name}.cfg":
# ensure => present, # ensure => present,
# mode => "0644", # mode => "0640",
# owner => "root", # owner => "root",
# group => "root", # group => "nagios",
# before => Nagios_Hostextinfo[$name], # before => Nagios_Hostextinfo[$name],
# require => File["/etc/nagios/conf.d"],
# } # }
# nagios_hostextinfo { $name: # nagios_hostextinfo { $name:
# ensure => present, # ensure => present,
@ -303,11 +310,12 @@ define nagios::host($confdir, $operatingsystem) {
define nagios::service($confdir, $host, $command, $description) { define nagios::service($confdir, $host, $command, $description) {
file { "${confdir}/service_${name}.cfg": file { "${confdir}/service_${name}.cfg":
ensure => present, ensure => present,
mode => "0644", mode => "0640",
owner => "root", owner => "root",
group => "root", group => "nagios",
before => Nagios_Service[$name], before => Nagios_Service[$name],
require => File["/etc/nagios/conf.d"],
} }
nagios_service { $name: nagios_service { $name:
host_name => $host, host_name => $host,