File nagiosgraph-fhs.patch of Package nagiosgraph
diff -r -u nagiosgraph-1.5.1.orig/cgi/export.cgi nagiosgraph-1.5.1.fhs_fix/cgi/export.cgi --- nagiosgraph-1.5.1.orig/cgi/export.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/export.cgi 2014-06-26 13:48:44.402653771 +0200 @@ -9,7 +9,7 @@ ## no critic (ProhibitPostfixControls) # ngshared.pm and configuration files must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/show.cgi nagiosgraph-1.5.1.fhs_fix/cgi/show.cgi --- nagiosgraph-1.5.1.orig/cgi/show.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/show.cgi 2014-06-26 13:48:44.409653931 +0200 @@ -7,7 +7,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/showconfig.cgi nagiosgraph-1.5.1.fhs_fix/cgi/showconfig.cgi --- nagiosgraph-1.5.1.orig/cgi/showconfig.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/showconfig.cgi 2014-06-26 13:48:44.412653966 +0200 @@ -9,7 +9,7 @@ ## no critic (ProhibitPackageVars) # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use POSIX; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/showgraph.cgi nagiosgraph-1.5.1.fhs_fix/cgi/showgraph.cgi --- nagiosgraph-1.5.1.orig/cgi/showgraph.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/showgraph.cgi 2014-06-26 13:48:44.418654001 +0200 @@ -7,7 +7,7 @@ # Author: (c) 2010 Matthew Wall # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use ngshared; use RRDs; diff -r -u nagiosgraph-1.5.1.orig/cgi/showgroup.cgi nagiosgraph-1.5.1.fhs_fix/cgi/showgroup.cgi --- nagiosgraph-1.5.1.orig/cgi/showgroup.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/showgroup.cgi 2014-06-26 13:48:44.406653879 +0200 @@ -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 '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/showhost.cgi nagiosgraph-1.5.1.fhs_fix/cgi/showhost.cgi --- nagiosgraph-1.5.1.orig/cgi/showhost.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/showhost.cgi 2014-06-26 13:48:44.414653978 +0200 @@ -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 '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/showservice.cgi nagiosgraph-1.5.1.fhs_fix/cgi/showservice.cgi --- nagiosgraph-1.5.1.orig/cgi/showservice.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/showservice.cgi 2014-06-26 13:48:44.416653979 +0200 @@ -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 '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/cgi/testcolor.cgi nagiosgraph-1.5.1.fhs_fix/cgi/testcolor.cgi --- nagiosgraph-1.5.1.orig/cgi/testcolor.cgi 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/cgi/testcolor.cgi 2014-06-26 13:48:44.404653830 +0200 @@ -9,7 +9,7 @@ ## no critic (ProhibitConstantPragma) # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use ngshared; use English qw(-no_match_vars); diff -r -u nagiosgraph-1.5.1.orig/etc/nagiosgraph.conf nagiosgraph-1.5.1.fhs_fix/etc/nagiosgraph.conf --- nagiosgraph-1.5.1.orig/etc/nagiosgraph.conf 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/etc/nagiosgraph.conf 2014-06-26 13:54:09.766393018 +0200 @@ -8,22 +8,22 @@ # Author: (c) 2010 Matthew Wall # Location of output from nagiosgraph data processing -logfile = /var/nagiosgraph/nagiosgraph.log +logfile = /var/log/nagios/nagiosgraph.log # Location of output from nagiosgraph CGI scripts -cgilogfile = /var/nagiosgraph/nagiosgraph-cgi.log +cgilogfile = /var/log/nagios/nagiosgraph-cgi.log # Location of nagios performance data log file. -perflog = /var/nagios/perfdata.log +perflog = /var/log/nagiosgraph/perfdata.log # Directory in which to store RRD files -rrddir = /var/nagiosgraph/rrd +rrddir = /var/lib/nagios/rrd # File containing regular expressions to identify service and perf data mapfile = /etc/nagiosgraph/map # Nagiosgraph CGI URL. -nagiosgraphcgiurl = /nagiosgraph/cgi-bin +nagiosgraphcgiurl = /nagios/cgi-bin # Nagios CGI URL. If the Nagiosgraph CGI scripts are in a directory other # than the Nagios CGI directory, then specify the Nagios CGI URL here. diff -r -u nagiosgraph-1.5.1.orig/lib/insert.pl nagiosgraph-1.5.1.fhs_fix/lib/insert.pl --- nagiosgraph-1.5.1.orig/lib/insert.pl 2013-06-12 00:09:56.000000000 +0200 +++ nagiosgraph-1.5.1.fhs_fix/lib/insert.pl 2014-06-26 13:56:23.710233379 +0200 @@ -36,7 +36,7 @@ # to the nagiosgraph log file. # The configuration file and ngshared.pm must be in this directory: -use lib '/opt/nagiosgraph/etc'; +use lib '/etc/nagiosgraph'; use ngshared; use strict;
