diff -Naur --exclude '*~' nagiosgraph-1.1.3/cgi/show.cgi nagiosgraph-1.1.3-fhs/cgi/show.cgi
--- nagiosgraph-1.1.3/cgi/show.cgi 2008-09-19 15:52:24.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/cgi/show.cgi 2008-12-25 21:43:50.000000000 +0100
@@ -6,7 +6,7 @@
# http://www.opensource.org/licenses/artistic-license-2.0.php
# The configuration file and ngshared.pm must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/cgi/showgraph.cgi nagiosgraph-1.1.3-fhs/cgi/showgraph.cgi
--- nagiosgraph-1.1.3/cgi/showgraph.cgi 2008-09-19 15:52:31.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/cgi/showgraph.cgi 2008-12-25 21:44:03.000000000 +0100
@@ -6,7 +6,7 @@
# http://www.opensource.org/licenses/artistic-license-2.0.php
# The configuration file and ngshared.pm must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/cgi/showhost.cgi nagiosgraph-1.1.3-fhs/cgi/showhost.cgi
--- nagiosgraph-1.1.3/cgi/showhost.cgi 2008-09-19 15:52:36.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/cgi/showhost.cgi 2008-12-25 21:44:51.000000000 +0100
@@ -8,7 +8,7 @@
# Author: (c) Alan Brenner, Ithaka Harbors, 2008
# The configuration file and ngshared.pm must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/cgi/showservice.cgi nagiosgraph-1.1.3-fhs/cgi/showservice.cgi
--- nagiosgraph-1.1.3/cgi/showservice.cgi 2008-09-19 15:52:41.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/cgi/showservice.cgi 2008-12-25 21:44:17.000000000 +0100
@@ -8,7 +8,7 @@
# Author: (c) Alan Brenner, Ithaka Harbors, 2008
# The configuration file and ngshared.pm must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/cgi/testcolor.cgi nagiosgraph-1.1.3-fhs/cgi/testcolor.cgi
--- nagiosgraph-1.1.3/cgi/testcolor.cgi 2008-09-19 15:52:47.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/cgi/testcolor.cgi 2008-12-25 21:44:32.000000000 +0100
@@ -7,7 +7,7 @@
# Author: (c) Alan Brenner, Ithaka Harbors, 2008
# The ngshared.pm file must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/etc/nagiosgraph.conf nagiosgraph-1.1.3-fhs/etc/nagiosgraph.conf
--- nagiosgraph-1.1.3/etc/nagiosgraph.conf 2008-12-05 20:55:58.000000000 +0100
+++ nagiosgraph-1.1.3-fhs/etc/nagiosgraph.conf 2008-12-25 21:52:48.000000000 +0100
@@ -34,10 +34,10 @@
logfile = /var/log/nagiosgraph.log
# Directory to store rrd database files
-rrddir = /usr/local/nagios/nagiosgraph/rrd
+rrddir = /var/lib/nagiosgraph
# File containing regular expressions to identify service and perf data
-mapfile = /usr/local/nagios/nagiosgraph/map
+mapfile = /etc/nagiosgraph/map
# Color scheme for graphs. Choose a number between 1 and 9.
colorscheme = 1
@@ -55,7 +55,7 @@
#perfloop = 1
# Stylesheet - added to head of show.cgi, etc. Comment out if not used
-stylesheet = /nagios/stylesheets/nagiosgraph.css
+stylesheet = /nagiosgraph/nagiosgraph.css
# RRAs resolution (optional, don't touch if you don't know what you are doing)
#resolution = 17280 17520 32850 1095
@@ -90,10 +90,10 @@
#hostservvar = host2,PLW,smtp_error
# Location of hosts/database control file
-hostdb = /etc/nagios/nagiosgraph/hostdb.conf
+hostdb = /etc/nagiosgraph/hostdb.conf
# Location of services/database control file
-servdb = /etc/nagios/nagiosgraph/servdb.conf
+servdb = /etc/nagiosgraph/servdb.conf
# Nagios CGI URL
nagioscgiurl = https://nagiosserver/nagios/cgi-bin
diff -Naur --exclude '*~' nagiosgraph-1.1.3/etc/ngshared.pm nagiosgraph-1.1.3-fhs/etc/ngshared.pm
--- nagiosgraph-1.1.3/etc/ngshared.pm 2008-12-22 18:54:08.000000000 +0100
+++ nagiosgraph-1.1.3-fhs/etc/ngshared.pm 2008-12-25 21:37:55.000000000 +0100
@@ -173,7 +173,7 @@
if (not $bConf) {
print div({-class => "error"},
'Nagiosgraph has detected an error in the configuration file: '
- . $INC[0] . '/nagiosgraph.conf.');
+ . '/etc/nagiosgraph/nagiosgraph.conf.');
}
print div($msg);
print end_html();
@@ -279,10 +279,10 @@
open LOG, ">&=STDERR";
$Config{debug} = $debug;
dumper(5, 'INC', \@INC);
- debug(5, "opening $INC[0]/nagiosgraph.conf'");
+ debug(5, "opening /etc/nagiosgraph/nagiosgraph.conf'");
}
- open FH, $INC[0] . '/nagiosgraph.conf' or
- ($Config{ngshared} = "$INC[0]/nagiosgraph.conf not found") and return;
+ open FH, '/etc/nagiosgraph/nagiosgraph.conf' or
+ ($Config{ngshared} = "/etc/nagiosgraph/nagiosgraph.conf not found") and return;
my ($key, $val);
while (<FH>) {
s/\s*#.*//; # Strip comments
diff -Naur --exclude '*~' nagiosgraph-1.1.3/lib/insert.pl nagiosgraph-1.1.3-fhs/lib/insert.pl
--- nagiosgraph-1.1.3/lib/insert.pl 2008-09-26 20:51:12.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/lib/insert.pl 2008-12-25 21:43:10.000000000 +0100
@@ -7,7 +7,7 @@
# Author: (c) Alan Brenner, Ithaka Harbors, 2008
# The configuration file and ngshared.pm must be in this directory.
-use lib '/etc/nagios/nagiosgraph';
+use lib '/usr/share/nagiosgraph/lib';
# The configuration loader will look for nagiosgraph.conf in this directory.
# So take note upgraders, there is no $configfile = '....' line anymore.
diff -Naur --exclude '*~' nagiosgraph-1.1.3/lib/insert.sh nagiosgraph-1.1.3-fhs/lib/insert.sh
--- nagiosgraph-1.1.3/lib/insert.sh 2008-09-10 16:14:51.000000000 +0200
+++ nagiosgraph-1.1.3-fhs/lib/insert.sh 2008-12-25 21:43:12.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 "$*"
