diff options
author | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
commit | 2b2268702938453bcece9ebe6070c03929910f8a (patch) | |
tree | f7ddfdfaf2430b19dcb7f89b3c16ccf4321976de /manifests/base.pp | |
parent | df358dcf15d26ba59b59f686ceee4b07b3aed7dd (diff) | |
parent | a2a80093d42b7e9eec9d2af3c66138f7ceaf9ed6 (diff) |
Merge remote-tracking branch 'riseup/master' into HEAD
Conflicts:
manifests/apache.pp
manifests/base.pp
manifests/defaults/templates.pp
manifests/defaults/vars.pp
manifests/init.pp
manifests/irc_bot.pp
manifests/nsca/client.pp
manifests/nsca/server.pp
manifests/service.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 0f8b777..c4ba260 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -26,6 +26,13 @@ class nagios::base { mode => 0644, owner => root, group => root; } + file { 'nagios_commands_cfg': + path => "${nagios::defaults::vars::int_cfgdir}/commands.cfg", + ensure => present, + notify => Service['nagios'], + mode => 0644, owner => root, group => root; + } + file { 'nagios_cgi_cfg': path => "${nagios::defaults::vars::int_cfgdir}/cgi.cfg", source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/cgi.cfg", |