From f05deb4bad829ec5cdb0a77841aa95a5f07f55a1 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:56:59 -0400 Subject: add amd64 resources, fix the other to be a symlink since it's the same --- files/configs/Debian/private/resource.cfg.amd64 | 1 + files/configs/Debian/private/resource.cfg.x86_64 | 32 +----------------------- 2 files changed, 2 insertions(+), 31 deletions(-) create mode 120000 files/configs/Debian/private/resource.cfg.amd64 mode change 100644 => 120000 files/configs/Debian/private/resource.cfg.x86_64 (limited to 'files') diff --git a/files/configs/Debian/private/resource.cfg.amd64 b/files/configs/Debian/private/resource.cfg.amd64 new file mode 120000 index 0000000..4d5f0a3 --- /dev/null +++ b/files/configs/Debian/private/resource.cfg.amd64 @@ -0,0 +1 @@ +resource.cfg.i386 \ No newline at end of file diff --git a/files/configs/Debian/private/resource.cfg.x86_64 b/files/configs/Debian/private/resource.cfg.x86_64 deleted file mode 100644 index 3ed732b..0000000 --- a/files/configs/Debian/private/resource.cfg.x86_64 +++ /dev/null @@ -1,31 +0,0 @@ -########################################################################### -# -# RESOURCE.CFG - Resource File for Nagios -# -# You can define $USERx$ macros in this file, which can in turn be used -# in command definitions in your host config file(s). $USERx$ macros are -# useful for storing sensitive information such as usernames, passwords, -# etc. They are also handy for specifying the path to plugins and -# event handlers - if you decide to move the plugins or event handlers to -# a different directory in the future, you can just update one or two -# $USERx$ macros, instead of modifying a lot of command definitions. -# -# The CGIs will not attempt to read the contents of resource files, so -# you can set restrictive permissions (600 or 660) on them. -# -# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$) -# -# Resource files may also be used to store configuration directives for -# external data sources like MySQL... -# -########################################################################### - -# Sets $USER1$ to be the path to the plugins -$USER1$=/usr/lib/nagios/plugins - -# Sets $USER2$ to be the path to event handlers -#$USER2$=/usr/lib/nagios/plugins/eventhandlers - -# Store some usernames and passwords (hidden from the CGIs) -#$USER3$=someuser -#$USER4$=somepassword diff --git a/files/configs/Debian/private/resource.cfg.x86_64 b/files/configs/Debian/private/resource.cfg.x86_64 new file mode 120000 index 0000000..4d5f0a3 --- /dev/null +++ b/files/configs/Debian/private/resource.cfg.x86_64 @@ -0,0 +1 @@ +resource.cfg.i386 \ No newline at end of file -- cgit v1.2.3 From 61aab91919b2e6d9cb5d7afe3befe40de67ac132 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:57:28 -0400 Subject: include the commands.cfg file in Debian since we need the notify-(host|service)-by-email commands --- files/configs/Debian/nagios.cfg | 1 + 1 file changed, 1 insertion(+) (limited to 'files') diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index 377da6b..8eae393 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -20,6 +20,7 @@ log_file=/var/log/nagios3/nagios.log # host groups, contacts, contact groups, services, etc. # You can split your object definitions across several config files # if you wish (as shown below), or keep them all in a single config file. +cfg_file=/etc/nagios3/commands.cfg # Puppet-managed configuration files cfg_dir=/etc/nagios3/conf.d -- cgit v1.2.3 From 41571b20b23d7313c192e233ec9b76a89af05354 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:57:57 -0400 Subject: add a default empty htpasswd so the catalog compiles right --- files/htpasswd.users | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/htpasswd.users (limited to 'files') diff --git a/files/htpasswd.users b/files/htpasswd.users new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From 99b97c407f448e2a1d0d5f4cabda4b78f05d4753 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Jun 2010 22:34:30 +0200 Subject: adjust plugin stuff, so we can remotely specify new plugins --- files/plugins/check_jabber_login | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 files/plugins/check_jabber_login (limited to 'files') diff --git a/files/plugins/check_jabber_login b/files/plugins/check_jabber_login deleted file mode 100644 index dac0e1f..0000000 --- a/files/plugins/check_jabber_login +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env ruby -require 'rubygems' -require 'xmpp4r' - - -def usage - puts "#{$0} jabberid password" - exit 3 -end - -usage unless ARGV.size == 2 - -begin - my_client = Jabber::Client.new(ARGV[0]) - my_client.connect - my_client.auth(ARGV[1]) -rescue Jabber::ClientAuthenticationFailure => detail - puts "CRITICAL: Login Error" - exit 2 -rescue Errno::ECONNREFUSED => detail - puts "CRITICAL: Connection refused" - exit 2 -rescue SocketError => detail - puts "CRITICAL: Socket Error" - exit 2 -#rescue -# puts "CRITICAL: Unknown Error" -# exit 2 -end -puts "OK: Login for #{ARGV[0]} successfull" -- cgit v1.2.3