rpms / nagios

Clone
Source Code
GIT

Files

el4 el5 el6 epel7 epel8 epel8-playground epel9 f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f23 f24 f25 f26 f27 f28 f29 f30 f31 f32 f33 f34 f35 f36 f37 f38 f39 f40 f7 f8 f9 fc6 main rawhide
  1.   f27
  2.   nagios-0009-fix-localstatedir-for-linux.patch
Blob Blame History Raw 
diff -up ./Makefile.in.fix_localstatedir ./Makefile.in
--- ./Makefile.in.fix_localstatedir	2017-09-19 11:58:08.102798687 -0400
+++ ./Makefile.in	2017-09-19 12:02:27.945557637 -0400
@@ -23,7 +23,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CHECKRESULTDIR=@CHECKRESULTDIR@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
diff -up ./base/Makefile.in.fix_localstatedir ./base/Makefile.in
--- ./base/Makefile.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./base/Makefile.in	2017-09-19 12:02:16.478347616 -0400
@@ -33,7 +33,7 @@ LIBS=@LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
diff -up ./cgi/Makefile.in.fix_localstatedir ./cgi/Makefile.in
--- ./cgi/Makefile.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./cgi/Makefile.in	2017-09-19 12:17:02.239568641 -0400
@@ -12,7 +12,7 @@ SRC_LIB=../lib
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
diff -up ./common/Makefile.in.fix_localstatedir ./common/Makefile.in
--- ./common/Makefile.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./common/Makefile.in	2017-09-19 12:17:01.696558698 -0400
@@ -13,7 +13,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
diff -up ./daemon-init.in.fix_localstatedir ./daemon-init.in
--- ./daemon-init.in.fix_localstatedir	2017-09-19 11:58:08.099798632 -0400
+++ ./daemon-init.in	2017-09-19 12:14:54.147222973 -0400
@@ -43,11 +43,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 NagiosBin=@bindir@/nagios
 NagiosCfgFile=@sysconfdir@/nagios.cfg
-NagiosCfgtestFile=@localstatedir@/nagios.configtest
-NagiosStatusFile=@localstatedir@/status.dat
-NagiosRetentionFile=@localstatedir@/retention.dat
-NagiosCommandFile=@localstatedir@/rw/nagios.cmd
-NagiosVarDir=@localstatedir@
+NagiosCfgtestFile=@localstatedir@/log/nagios/nagios.configtest
+NagiosStatusFile=@localstatedir@/log/nagios/status.dat
+NagiosRetentionFile=@localstatedir@/log/nagios/retention.dat
+NagiosCommandFile=@localstatedir@/spool/nagios/cmd/nagios.cmd
+NagiosVarDir=@localstatedir@/log/nagios/
 NagiosRunFile=@lockfile@
 NagiosLockDir=/var/lock/subsys
 NagiosLockFile=nagios
diff -up ./html/Makefile.in.fix_localstatedir ./html/Makefile.in
--- ./html/Makefile.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./html/Makefile.in	2017-09-19 12:17:00.893543992 -0400
@@ -4,7 +4,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
diff -up ./html/config.inc.php.in.fix_localstatedir ./html/config.inc.php.in
--- ./html/config.inc.php.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./html/config.inc.php.in	2017-09-19 12:19:57.990787053 -0400
@@ -9,11 +9,8 @@ $cfg['cgi_base_url']='@cgiurl@';
 
 // FILE LOCATION DEFAULTS
 $cfg['main_config_file']='@sysconfdir@/nagios.cfg';  // default location of the main Nagios config file
-$cfg['status_file']='@localstatedir@/status.dat'; // default location of Nagios status file
-$cfg['state_retention_file']='@localstatedir@/retention.dat'; // default location of Nagios retention file
-
-
-
+$cfg['status_file']='@localstatedir@/log/nagios/status.dat'; // default location of Nagios status file
+$cfg['state_retention_file']='@localstatedir@/log/nagios/retention.dat'; // default location of Nagios retention file
 // utilities
 require_once(dirname(__FILE__).'/includes/utils.inc.php');
 
diff -up ./include/locations.h.in.fix_localstatedir ./include/locations.h.in
--- ./include/locations.h.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./include/locations.h.in	2017-09-19 12:12:00.204037670 -0400
@@ -17,18 +17,18 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  ************************************************************************/
 
-#define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
+#define DEFAULT_TEMP_FILE			"@localstatedir@/spool/nagios/tempfile"
 #define DEFAULT_TEMP_PATH                       "/tmp"
-#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/checkresults"
-#define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
-#define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
-#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
-#define DEFAULT_DEBUG_FILE                      "@localstatedir@/nagios.debug"
-#define DEFAULT_COMMENT_FILE			"@localstatedir@/comments.dat"
-#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/downtime.dat"
-#define DEFAULT_RETENTION_FILE			"@localstatedir@/retention.dat"
-#define DEFAULT_COMMAND_FILE			"@localstatedir@/rw/nagios.cmd"
-#define DEFAULT_QUERY_SOCKET            "@localstatedir@/rw/nagios.qh"
+#define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/nagios/checkresults"
+#define DEFAULT_STATUS_FILE			"@localstatedir@/log/nagios/status.dat"
+#define DEFAULT_LOG_FILE			"@localstatedir@/log/nagios/nagios.log"
+#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/log/nagios/archives/"
+#define DEFAULT_DEBUG_FILE                      "@localstatedir@/log/nagios/nagios.debug"
+#define DEFAULT_COMMENT_FILE			"@localstatedir@/log/nagios/comments.dat"
+#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/log/nagios/downtime.dat"
+#define DEFAULT_RETENTION_FILE			"@localstatedir@/log/nagios/retention.dat"
+#define DEFAULT_COMMAND_FILE			"@localstatedir@/spool/nagios/cmd/nagios.cmd"
+#define DEFAULT_QUERY_SOCKET                    "@localstatedir@/spool/nagios/cmd/nagios.qh"
 #define DEFAULT_CONFIG_FILE			"@sysconfdir@/nagios.cfg"
 #define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
 #define DEFAULT_URL_HTML_PATH			"@htmurl@"
@@ -36,6 +36,6 @@
 #define DEFAULT_URL_CGIBIN_PATH			"@cgiurl@"
 #define DEFAULT_CGI_CONFIG_FILE			"@sysconfdir@/cgi.cfg"
 #define DEFAULT_LOCK_FILE			"@lockfile@"
-#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/objects.cache"
-#define DEFAULT_PRECACHED_OBJECT_FILE		"@localstatedir@/objects.precache"
-#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/broker.socket"
+#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/spool/nagios/objects.cache"
+#define DEFAULT_PRECACHED_OBJECT_FILE		"@localstatedir@/spool/nagios/objects.precache"
+#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/spool/nagios/broker.socket"
diff -up ./sample-config/nagios.cfg.in.fix_localstatedir ./sample-config/nagios.cfg.in
--- ./sample-config/nagios.cfg.in.fix_localstatedir	2017-09-19 11:58:08.107798779 -0400
+++ ./sample-config/nagios.cfg.in	2017-09-19 12:23:46.431970340 -0400
@@ -15,7 +15,7 @@
 # for historical purposes.  This should be the first option specified 
 # in the config file!!!
 
-log_file=@localstatedir@/nagios.log
+log_file=@localstatedir@/log/nagios/nagios.log
 
 
 
@@ -65,7 +65,7 @@ cfg_dir=@sysconfdir@/conf.d
 # directly) in order to prevent inconsistencies that can occur
 # when the config files are modified after Nagios starts.
 
-object_cache_file=@localstatedir@/objects.cache
+object_cache_file=@localstatedir@/spool/nagios/objects.cache
 
 
 
@@ -81,7 +81,7 @@ object_cache_file=@localstatedir@/object
 # Read the documentation section on optimizing Nagios to find our more
 # about how this feature works.
 
-precached_object_file=@localstatedir@/objects.precache
+precached_object_file=@localstatedir@/spool/nagios/objects.precache
 
 
 
@@ -104,7 +104,7 @@ resource_file=@sysconfdir@/resource.cfg
 # The contents of the status file are deleted every time Nagios
 #  restarts.
 
-status_file=@localstatedir@/status.dat
+status_file=@localstatedir@/log/nagios/status.dat
 
 
 
@@ -153,14 +153,14 @@ check_external_commands=1
 # directory level instead of on the file, as the file is deleted every
 # time its contents are processed.
 
-command_file=@localstatedir@/rw/nagios.cmd
+command_file=@localstatedir@/spool/nagios/cmd/nagios.cmd
 
 
 
 # QUERY HANDLER INTERFACE
 # This is the socket that is created for the Query Handler interface
 
-#query_socket=@localstatedir@/rw/nagios.qh
+#query_socket=@localstatedir@/spool/nagios/cmd/nagios.qh
 
 
 
@@ -178,7 +178,7 @@ lock_file=@lockfile@
 # is created, used, and deleted throughout the time that Nagios is
 # running.
 
-temp_file=@localstatedir@/nagios.tmp
+temp_file=@localstatedir@/spool/nagios/nagios.tmp
 
 
 
@@ -244,7 +244,7 @@ log_rotation_method=d
 # This is the directory where archived (rotated) log files should be 
 # placed (assuming you've chosen to do log rotation).
 
-log_archive_path=@localstatedir@/archives
+log_archive_path=@localstatedir@/log/nagios/archives
 
 
 
@@ -618,7 +618,7 @@ retain_state_information=1
 # This file is used only if the retain_state_information
 # variable is set to 1.
 
-state_retention_file=@localstatedir@/retention.dat
+state_retention_file=@localstatedir@/log/nagios/retention.dat
 
 
 
@@ -831,8 +831,8 @@ process_performance_data=0
 # Performance data is only written to these files if the
 # enable_performance_data option (above) is set to 1.
 
-#host_perfdata_file=@localstatedir@/host-perfdata
-#service_perfdata_file=@localstatedir@/service-perfdata
+#host_perfdata_file=@localstatedir@/log/nagios/host-perfdata
+#service_perfdata_file=@localstatedir@/log/nagios/service-perfdata
 
 
 
@@ -1289,7 +1289,7 @@ debug_verbosity=1
 # DEBUG FILE
 # This option determines where Nagios should write debugging information.
 
-debug_file=@localstatedir@/nagios.debug
+debug_file=@localstatedir@/log/nagios/nagios.debug
 
 
 
diff -up ./sample-config/template-object/commands.cfg.in.fix_localstatedir ./sample-config/template-object/commands.cfg.in
--- ./sample-config/template-object/commands.cfg.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./sample-config/template-object/commands.cfg.in	2017-09-19 12:32:34.317635518 -0400
@@ -226,14 +226,14 @@ define command{
 # 'process-host-perfdata' command definition
 define command{
 	command_name	process-host-perfdata
-	command_line	/usr/bin/printf "%b" "$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n" >> @localstatedir@/host-perfdata.out
+	command_line	/usr/bin/printf "%b" "$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n" >> @localstatedir@/log/nagios/host-perfdata.out
 	}
 
 
 # 'process-service-perfdata' command definition
 define command{
 	command_name	process-service-perfdata
-	command_line	/usr/bin/printf "%b" "$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n" >> @localstatedir@/service-perfdata.out
+	command_line	/usr/bin/printf "%b" "$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n" >> @localstatedir@/log/nagios/service-perfdata.out
 	}
 
 
diff -up ./t-tap/Makefile.in.fix_localstatedir ./t-tap/Makefile.in
--- ./t-tap/Makefile.in.fix_localstatedir	2017-08-24 17:43:48.000000000 -0400
+++ ./t-tap/Makefile.in	2017-09-19 12:03:51.446086926 -0400
@@ -42,7 +42,7 @@ LIBS=@LIBS@ ../lib/libnagios.a
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@localstatedir@/log/nagios/
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.