| @@ -1,43 +1,68 @@
---- plugin/plugin_db.conf.orig 1970-01-01 01:00:00.000000000 +0100
-+++ plugin/plugin_db.conf 2013-11-02 12:36:52.674511386 +0100
-@@ -0,0 +1,6 @@
-+my $dbHost = "localhost";
-+my $dbName = "snmptt";
-+my $dbUser = "<YOUR DB USER>";
-+my $dbPass = "<YOUR DB PASSWORD>";
-+my $dbTable = "snmptt";
-+my $dbTableUnknown = "snmptt_unknown";
--- plugin/check_jobs.pl.in.orig 2013-11-02 12:34:30.935086664 +0100
-+++ plugin/check_jobs.pl.in 2013-11-02 12:35:44.486705000 +0100
-@@ -21,11 +21,7 @@
++++ plugin/check_jobs.pl.in 2013-11-02 13:06:24.328934170 +0100
+@@ -20,13 +20,6 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
- # ==================== Database connect information ====================
+-# ==================== Database connect information ====================
-my $dbHost = "localhost";
-my $dbName = "nagtrap";
-my $dbUser = "root";
-my $dbPass = "";
-my $dbTable = "snmptt_jobs";
-+require "@sysconfdir@/plugin_db.conf";
-
+-
# ==================== Debugging ====================
my $enableDebug = "0";
+ my $debugLogFile = "@logdir@/check_jobs.log";
+@@ -51,7 +44,14 @@
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ use Time::HiRes qw(time);
+ use DBI();
+-
++# ==================== Database connect information ====================
++our $dbHost;
++our $dbName;
++our $dbUser;
++our $dbPass;
++our $dbTable;
++our $dbTableUnknown;
++require "/etc/nagtrap/plugin_db.conf";
+ # ==================== Functions ====================
+ # Print Usage
+ sub print_usage (){
--- plugin/check_snmptraps.pl.in.orig 2013-11-02 12:34:21.551088535 +0100
-+++ plugin/check_snmptraps.pl.in 2013-11-02 12:36:37.966708859 +0100
-@@ -21,12 +21,7 @@
++++ plugin/check_snmptraps.pl.in 2013-11-02 13:06:10.584945654 +0100
+@@ -20,14 +20,6 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
- # ==================== Database connect information ====================
+-# ==================== Database connect information ====================
-my $dbHost = "localhost";
-my $dbName = "snmptt";
-my $dbUser = "<YOUR DB USER>";
-my $dbPass = "<YOUR DB PASSWORD>";
-my $dbTable = "snmptt";
-my $dbTableUnknown = "snmptt_unknown";
-+require "@sysconfdir@/plugin_db.conf";
-
+-
# ==================== Debugging ====================
my $enableDebug = "0";
+ my $debugLogFile = "@logdir@/check_snmptraps.log";
+@@ -67,7 +59,14 @@
+ use utils qw($TIMEOUT %ERRORS &print_revision &support);
+ use Time::HiRes qw(time);
+ use DBI();
+-
++# ==================== Database connect information ====================
++our $dbHost;
++our $dbName;
++our $dbUser;
++our $dbPass;
++our $dbTable;
++our $dbTableUnknown;
++require "/etc/nagtrap/plugin_db.conf";
+ # ==================== Functions ====================
+ # Print Usage
+ sub print_usage (){
--- plugin/Makefile.in.orig 2013-11-02 12:37:12.738512929 +0100
+++ plugin/Makefile.in 2013-11-02 12:38:01.450322856 +0100
@@ -38,6 +38,7 @@
@@ -48,3 +73,12 @@
clean:
rm -f Makefile
+--- plugin/plugin_db.conf.orig 2013-11-02 13:06:43.208934628 +0100
++++ plugin/plugin_db.conf 2013-11-02 13:05:54.924935016 +0100
+@@ -0,0 +1,6 @@
++$dbHost = "localhost";
++$dbName = "snmptt";
++$dbUser = "<YOUR DB USER>";
++$dbPass = "<YOUR DB PASSWORD>";
++$dbTable = "snmptt";
++$dbTableUnknown = "snmptt_unknown";
|
