diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/cgi/show.cgi nagiosgraph-1.4.2-fhs//cgi/show.cgi --- nagiosgraph-1.4.2/cgi/show.cgi 2010-03-15 14:58:58.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//cgi/show.cgi 2010-03-18 23:43:22.000000000 +0100 @@ -8,7 +8,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared qw(:SHOW); use English qw(-no_match_vars); diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/cgi/showgraph.cgi nagiosgraph-1.4.2-fhs//cgi/showgraph.cgi --- nagiosgraph-1.4.2/cgi/showgraph.cgi 2010-03-15 20:58:10.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//cgi/showgraph.cgi 2010-03-18 23:43:02.000000000 +0100 @@ -8,7 +8,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared qw(:SHOWGRAPH); use RRDs; diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/cgi/showhost.cgi nagiosgraph-1.4.2-fhs//cgi/showhost.cgi --- nagiosgraph-1.4.2/cgi/showhost.cgi 2010-03-15 14:58:58.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//cgi/showhost.cgi 2010-03-18 23:42:41.000000000 +0100 @@ -9,7 +9,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared qw(:SHOWHOST); use English qw(-no_match_vars); diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/cgi/showservice.cgi nagiosgraph-1.4.2-fhs//cgi/showservice.cgi --- nagiosgraph-1.4.2/cgi/showservice.cgi 2010-03-15 14:58:58.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//cgi/showservice.cgi 2010-03-18 23:42:20.000000000 +0100 @@ -9,7 +9,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared qw(:SHOWSERVICE); use English qw(-no_match_vars); diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/cgi/testcolor.cgi nagiosgraph-1.4.2-fhs//cgi/testcolor.cgi --- nagiosgraph-1.4.2/cgi/testcolor.cgi 2010-03-15 14:58:58.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//cgi/testcolor.cgi 2010-03-18 23:41:55.000000000 +0100 @@ -10,7 +10,7 @@ ## no critic (ProhibitConstantPragma) # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared; use English qw(-no_match_vars); diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/etc/nagiosgraph.conf nagiosgraph-1.4.2-fhs//etc/nagiosgraph.conf --- nagiosgraph-1.4.2/etc/nagiosgraph.conf 2010-03-15 14:58:58.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//etc/nagiosgraph.conf 2010-03-18 23:38:56.000000000 +0100 @@ -17,7 +17,7 @@ perflog = /var/nagios/perfdata.log # Directory to store rrd database files -rrddir = /var/nagiosgraph/rrd +rrddir = /var/lib/nagiosgraph # File containing regular expressions to identify service and perf data mapfile = /etc/nagiosgraph/map diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/etc/ngshared.pm nagiosgraph-1.4.2-fhs//etc/ngshared.pm --- nagiosgraph-1.4.2/etc/ngshared.pm 2010-03-15 21:13:07.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//etc/ngshared.pm 2010-03-18 23:41:30.000000000 +0100 @@ -716,7 +716,7 @@ if (! $logid) { $logid = 'logfile'; } my $debug = 0; # set this higher to debug config file parsing - my $errstr = readfile($INC[0] . q(/) . $CFGNAME, \%Config, $debug); + my $errstr = readfile("/etc/$CFGNAME", \%Config, $debug); if ($errstr ne q()) { return $errstr; } initlog($app, $Config{$logid}); diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/lib/insert.pl nagiosgraph-1.4.2-fhs//lib/insert.pl --- nagiosgraph-1.4.2/lib/insert.pl 2010-03-15 14:58:59.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//lib/insert.pl 2010-03-18 23:39:39.000000000 +0100 @@ -7,7 +7,7 @@ # Author: (c) Matthew Wall, 2010 # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/usr/share/nagiosgraph/lib'; use ngshared; use strict; diff -Naur -x '*~' -x '*.orig' nagiosgraph-1.4.2/lib/insert.sh nagiosgraph-1.4.2-fhs//lib/insert.sh --- nagiosgraph-1.4.2/lib/insert.sh 2009-11-16 22:00:12.000000000 +0100 +++ nagiosgraph-1.4.2-fhs//lib/insert.sh 2010-03-18 23:38:56.000000000 +0100 @@ -11,4 +11,4 @@ # command_line /usr/local/lib/nagios/insert.sh "$LASTSERVICECHECK$||$HOSTNAME$||$SERVICEDESC$||$SERVICEOUTPUT$||$SERVICEPERFDATA$" #} -/usr/bin/perl /usr/local/lib/nagios/insert.pl "$*" +/usr/bin/perl /usr/share/nagiosgraph/bin/insert.pl "$*"