diff options
author | mh <mh@immerda.ch> | 2008-05-12 09:47:07 +0000 |
---|---|---|
committer | mh <mh@immerda.ch> | 2008-05-12 09:47:07 +0000 |
commit | 2a66d0b5521c5917bb1c4a694f1c124f18faf605 (patch) | |
tree | a54912538be0f9eeb60d5cacb6f4f282c1f09b65 | |
parent | a4fba66414f2d82e89c6001ba087caed32f97122 (diff) |
moved nagios config to files, due t the legacy stuff
-rw-r--r-- | files/configs/CentOS/nagios.cfg | 3 | ||||
-rw-r--r-- | manifests/init.pp | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg index ee86fd2..c3194c8 100644 --- a/files/configs/CentOS/nagios.cfg +++ b/files/configs/CentOS/nagios.cfg @@ -30,9 +30,6 @@ log_file=/var/log/nagios/nagios.log # This can be very useful if you want to keep command definitions # separate from host and contact definitions... -# legacy crap -cfg_dir=/etc/nagios/legacy - # all puppet native command paths cfg_file=/etc/nagios/nagios_command.cfg cfg_file=/etc/nagios/nagios_contact.cfg diff --git a/manifests/init.pp b/manifests/init.pp index 6388b4a..b0b7b53 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -91,17 +91,6 @@ class nagios::base { mode => 0644, owner => root, group => 0; } - # old way of commands to not break the current config - # TODO: integrate these commands into native nagios types - file{ "/etc/nagios/legacy/": - source => "puppet://$server/files/nagios/legacy", - ensure => directory, - recurse => true, - purge => true, - notify => Service[nagios], - mode => 0755, owner => root, group => 0; - } - nagios::command{ ssh_port: command_line => '$USER1$/check_ssh -p $ARG1$ $HOSTADDRESS$'; |