diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d1d0c72..0000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -nagios-3.2.1.tar.gz -/nagios-3.2.2.tar.gz -/nagios-3.2.3.tar.gz -/nagios-3.3.1.tar.gz -/nagios-3.4.1.tar.gz -/nagios-3.4.2.tar.gz -/nagios-3.4.3.tar.gz -/nagios-3.4.4.tar.gz -/nagios-3.5.0.tar.gz -/nagios-3.5.1.tar.gz -/nagios-4.0.8.tar.gz -/nagioscore-release-4.2.4.tar.gz -/nagioscore-nagios-4.3.1.tar.gz -/nagioscore-nagios-4.3.2.tar.gz -/nagioscore-nagios-4.3.4.tar.gz -/nagioscore-nagios-4.4.2.tar.gz -/nagioscore-nagios-4.4.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/nagios-0001-default-init.patch b/nagios-0001-default-init.patch deleted file mode 100644 index 422f0de..0000000 --- a/nagios-0001-default-init.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -up ./startup/default-init.in.fix_el6_init ./startup/default-init.in ---- ./startup/default-init.in.fix_el6_init 2019-01-15 09:58:00.000000000 -0500 -+++ ./startup/default-init.in 2019-02-05 09:38:09.463144849 -0500 -@@ -1,6 +1,6 @@ - #!/bin/sh - # --# chkconfig: 345 99 01 -+# chkconfig: - 99 01 - # description: Nagios network monitor - # processname: nagios - # File : nagios -@@ -24,6 +24,9 @@ - # - Clean out redhat macros and other dependencies - # 2003-01-11 Ethan Galstad - # - Updated su syntax (Gary Miller) -+# 2018-11-28 Justin Paulsen -+# - Patched for EPEL release of Nagioscore 4.4.2 -+# - - nagios-0001-default-init.patch - # - # Description: Starts and stops the Nagios monitor - # used to provide network services status. -@@ -91,12 +94,12 @@ check_config () - echo "ERROR: Could not delete '$NagiosCfgtestFile'" - exit 8 - fi -- if ! su $NagiosUser -c "touch $NagiosCfgtestFile"; then -+ if ! su $NagiosUser -c "touch $NagiosCfgtestFile" -s /bin/sh ; then - echo "ERROR: Could not create or update '$NagiosCfgtestFile'" - exit 8 - fi - -- TMPFILE=$(mktemp /tmp/.configtest.XXXXXXXX) -+ TMPFILE=$(mktemp $NagiosCfgtestFile.XXX) - $NagiosBin -vp $NagiosCfgFile > "$TMPFILE" - WARN=`grep ^"Total Warnings:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g` - ERR=`grep ^"Total Errors:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g` -@@ -138,11 +141,14 @@ status_nagios () - - printstatus_nagios () - { -- if status_nagios; then -+ status_nagios $1 $2 -+ RETVAL=$? -+ if [ $RETVAL = 0 ]; then - echo "nagios (pid $NagiosPID) is running..." - else - echo "nagios is not running" - fi -+ return $RETVAL - } - - killproc_nagios () -@@ -157,7 +163,17 @@ pid_nagios () - return 1 - fi - -- NagiosPID=`head -n 1 $NagiosRunFile` -+ export NagiosPID=`head -n 1 $NagiosRunFile` -+ if [[ -z "$NagiosPID" ]]; then -+ echo "No usable PID found in $NagiosRunFile" -+ exit 1 -+ fi -+ -+ regex='^[0-9]+$' -+ if ! [[ $NagiosPID =~ $regex ]]; then -+ echo "PID not number found in $NagiosRunFile" -+ exit 1 -+ fi - } - - # Check that nagios exists. -@@ -188,7 +204,7 @@ case "$1" in - fi - fi - -- su $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" -+ su $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile" -s /bin/sh - @BIN_RM@ -f $NagiosCommandFile - touch $NagiosRunFile - $NagiosBin -d $NagiosCfgFile -@@ -281,6 +297,7 @@ case "$1" in - *) - echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig|configtest}" - exit 1 -+ exit 2 - ;; - - esac diff --git a/nagios-0002-Fix-installation-of-httpd-conf.d-config-file.patch b/nagios-0002-Fix-installation-of-httpd-conf.d-config-file.patch deleted file mode 100644 index bcd92b2..0000000 --- a/nagios-0002-Fix-installation-of-httpd-conf.d-config-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./Makefile.in.fix_httpd_conf_d ./Makefile.in ---- ./Makefile.in.fix_httpd_conf_d 2018-11-28 12:36:22.206486501 -0600 -+++ ./Makefile.in 2018-11-28 12:37:26.098414877 -0600 -@@ -337,6 +337,7 @@ install-groups-users: - @autoconf-macros/add_group_user $(DIST) $(NAGIOS_USER) $(NAGIOS_GRP) 1 - - install-webconf: -+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTTPD_CONF) - $(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf - if [ $(LN_HTTPD_SITES_ENABLED) -eq 1 ]; then \ - $(LN_S) $(DESTDIR)$(HTTPD_CONF)/nagios.conf $(DESTDIR)/etc/apache2/sites-enabled/nagios.conf; \ diff --git a/nagios-0003-Install-config-files-too.patch b/nagios-0003-Install-config-files-too.patch deleted file mode 100644 index 4bf4aa2..0000000 --- a/nagios-0003-Install-config-files-too.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./Makefile.in.install_config ./Makefile.in ---- ./Makefile.in.install_config 2017-04-19 19:11:47.783707415 -0400 -+++ ./Makefile.in 2017-04-19 19:11:47.785707384 -0400 -@@ -377,7 +377,7 @@ dox: - doxygen doxy.conf - - --fullinstall: install install-init install-commandmode install-webconf install-devel -+fullinstall: install install-init install-commandmode install-webconf install-devel install-config - - # Uninstall is too destructive if base install directory is /usr, etc. - #uninstall: diff --git a/nagios-0004-Fix-path-to-CGI-executables.patch b/nagios-0004-Fix-path-to-CGI-executables.patch deleted file mode 100644 index d3fdfe7..0000000 --- a/nagios-0004-Fix-path-to-CGI-executables.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3bdd7e40e1c7e7484edcb53b01ef3cd446305466 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Mon, 15 Nov 2010 15:07:49 +0300 -Subject: [PATCH 08/12] Fix path to CGI executables - -See rhbz #653291 for additional details: - -https://bugzilla.redhat.com/653291 - -Signed-off-by: Peter Lemenkov - - -Modified for 4.0.8 - Scott Wilkerson - ---- - sample-config/httpd.conf.in | 4 ++-- - subst.in | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/sample-config/httpd.conf.in b/sample-config/httpd.conf.in -index 71d4fbb..1b1e693 100644 ---- a/sample-config/httpd.conf.in -+++ b/sample-config/httpd.conf.in -@@ -5,9 +5,9 @@ - # configuration file. Customize the paths, etc. as - # needed to fit your system. - --ScriptAlias @cgiurl@ "@sbindir@" -+ScriptAlias @cgiurl@ "@cgidir@" - -- -+ - # SSLRequireSSL - Options ExecCGI - AllowOverride None -diff --git a/subst.in b/subst.in -index a8e2c06..bbffb3a 100755 ---- a/subst.in -+++ b/subst.in -@@ -35,6 +35,7 @@ while ($f = shift @ARGV) { - s|\@datarootdir\@|@datarootdir@|g; - s|\@sbindir\@|@sbindir@|g; - s|\@bindir\@|@bindir@|g; -+ s|\@cgidir\@|@libdir@/cgi-bin/|g; - s|\@htmurl\@|@htmurl@|g; - s|\@cgiurl\@|@cgiurl@|g; - s|\@MAIL_PROG\@|@MAIL_PROG@|g; --- -1.8.3.1 - diff --git a/nagios-0005-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch b/nagios-0005-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch deleted file mode 100644 index 1019607..0000000 --- a/nagios-0005-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up ./sample-config/httpd.conf.in.fix_path_to_passwd ./sample-config/httpd.conf.in ---- ./sample-config/httpd.conf.in.fix_path_to_passwd 2016-10-24 10:10:28.000000000 -0400 -+++ ./sample-config/httpd.conf.in 2016-11-08 14:37:02.117929826 -0500 -@@ -18,7 +18,7 @@ ScriptAlias @cgiurl@ "@sbindir@" - - AuthName "Nagios Access" - AuthType Basic -- AuthUserFile @sysconfdir@/htpasswd.users -+ AuthUserFile @sysconfdir@/passwd - Require valid-user - - -@@ -31,7 +31,7 @@ ScriptAlias @cgiurl@ "@sbindir@" - - AuthName "Nagios Access" - AuthType Basic -- AuthUserFile @sysconfdir@/htpasswd.users -+ AuthUserFile @sysconfdir@/passwd - Require valid-user - - -@@ -49,7 +49,7 @@ Alias @htmurl@ "@datadir@" - - AuthName "Nagios Access" - AuthType Basic -- AuthUserFile @sysconfdir@/htpasswd.users -+ AuthUserFile @sysconfdir@/passwd - Require valid-user - - -@@ -62,7 +62,7 @@ Alias @htmurl@ "@datadir@" - - AuthName "Nagios Access" - AuthType Basic -- AuthUserFile @sysconfdir@/htpasswd.users -+ AuthUserFile @sysconfdir@/passwd - Require valid-user - - diff --git a/nagios-0006-Added-several-images-to-the-sample-config-revb.patch b/nagios-0006-Added-several-images-to-the-sample-config-revb.patch deleted file mode 100644 index 09fea7e..0000000 --- a/nagios-0006-Added-several-images-to-the-sample-config-revb.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ./sample-config/template-object/templates.cfg.in.more_images ./sample-config/template-object/templates.cfg.in ---- ./sample-config/template-object/templates.cfg.in.more_images 2018-11-28 13:10:25.822264939 -0600 -+++ ./sample-config/template-object/templates.cfg.in 2018-11-28 13:16:15.711410141 -0600 -@@ -123,6 +123,7 @@ define host { - notification_interval 30 ; Resend notifications every 30 minutes - notification_options d,r ; Only send notifications for specific host states - contact_groups admins ; Notifications get sent to the admins by default -+ statusmap_image printer.png - register 0 ; DON'T REGISTER THIS - ITS JUST A TEMPLATE - } - -@@ -142,9 +143,17 @@ define host { - notification_interval 30 ; Resend notifications every 30 minutes - notification_options d,r ; Only send notifications for specific host states - contact_groups admins ; Notifications get sent to the admins by default -+ statusmap_image switch.png - register 0 ; DON'T REGISTER THIS - ITS JUST A TEMPLATE - } - -+# Define a template for routers that we can reuse -+define host{ -+ name generic-router ; The name of this host template -+ use generic-switch ; Inherit default values from the generic-host template -+ statusmap_image router.png -+ register 0 ; DONT REGISTER THIS - ITS JUST A TEMPLATE -+} - - - ############################################################################### diff --git a/nagios-0008-Add-cfg_dir-etc-nagios-conf.d-to-the-main-nagios-con.patch b/nagios-0008-Add-cfg_dir-etc-nagios-conf.d-to-the-main-nagios-con.patch deleted file mode 100644 index e22f333..0000000 --- a/nagios-0008-Add-cfg_dir-etc-nagios-conf.d-to-the-main-nagios-con.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./sample-config/nagios.cfg.in.conf_d ./sample-config/nagios.cfg.in ---- ./sample-config/nagios.cfg.in.conf_d 2017-08-24 17:43:48.000000000 -0400 -+++ ./sample-config/nagios.cfg.in 2017-09-15 18:29:48.659666387 -0400 -@@ -53,6 +53,8 @@ cfg_file=@sysconfdir@/objects/localhost. - #cfg_dir=@sysconfdir@/switches - #cfg_dir=@sysconfdir@/routers - -+cfg_dir=@sysconfdir@/conf.d -+ - - - diff --git a/nagios-0009-fix-localstatedir-for-linux.patch b/nagios-0009-fix-localstatedir-for-linux.patch deleted file mode 100644 index 3c18043..0000000 --- a/nagios-0009-fix-localstatedir-for-linux.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff -up ./base/Makefile.in.fix_localstatedir ./base/Makefile.in ---- ./base/Makefile.in.fix_localstatedir 2019-01-16 13:29:13.079040249 -0600 -+++ ./base/Makefile.in 2019-01-16 13:32:54.103372583 -0600 -@@ -33,7 +33,7 @@ LIBS=@LIBS@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --LOGDIR=@localstatedir@ -+LOGDIR=@localstatedir@/log/nagios/ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ - CGIDIR=@cgibindir@ -diff -up ./cgi/Makefile.in.fix_localstatedir ./cgi/Makefile.in ---- ./cgi/Makefile.in.fix_localstatedir 2019-01-16 13:33:14.596032529 -0600 -+++ ./cgi/Makefile.in 2019-01-16 13:33:35.252689754 -0600 -@@ -12,7 +12,7 @@ SRC_LIB=../lib - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --LOGDIR=@localstatedir@ -+LOGDIR=@localstatedir@/log/nagios/ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ - CGIDIR=@cgibindir@ -diff -up ./common/Makefile.in.fix_localstatedir ./common/Makefile.in ---- ./common/Makefile.in.fix_localstatedir 2019-01-16 13:33:51.236424521 -0600 -+++ ./common/Makefile.in 2019-01-16 13:34:17.928981586 -0600 -@@ -13,7 +13,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --LOGDIR=@localstatedir@ -+LOGDIR=@localstatedir@/log/nagios/ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ - CGIDIR=@cgibindir@ -diff -up ./html/config.inc.php.in.fix_localstatedir ./html/config.inc.php.in ---- ./html/config.inc.php.in.fix_localstatedir 2019-01-16 13:35:06.875169375 -0600 -+++ ./html/config.inc.php.in 2019-01-16 14:25:51.436714786 -0600 -@@ -9,8 +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@/spool/nagios/status.dat'; // default location of Nagios status file -+$cfg['state_retention_file']='@localstatedir@/spool/nagios/retention.dat'; // default location of Nagios retention file - - - -diff -up ./html/Makefile.in.fix_localstatedir ./html/Makefile.in ---- ./html/Makefile.in.fix_localstatedir 2019-01-16 13:37:18.936977949 -0600 -+++ ./html/Makefile.in 2019-01-16 13:37:36.645684091 -0600 -@@ -4,7 +4,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --LOGDIR=@localstatedir@ -+LOGDIR=@localstatedir@/log/nagios/ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ - CGIDIR=@cgibindir@ -diff -up ./include/locations.h.in.fix_localstatedir ./include/locations.h.in ---- ./include/locations.h.in.fix_localstatedir 2019-01-16 13:38:02.700251743 -0600 -+++ ./include/locations.h.in 2019-01-16 14:36:54.105757936 -0600 -@@ -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@/spool/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@/spool/nagios/comments.dat" -+#define DEFAULT_DOWNTIME_FILE "@localstatedir@/spool/nagios/downtime.dat" -+#define DEFAULT_RETENTION_FILE "@localstatedir@/spool/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 "@subsyslockfile@" --#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 2018-08-16 15:10:12.000000000 -0400 -+++ ./sample-config/nagios.cfg.in 2018-11-30 13:52:14.989761698 -0500 -@@ -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 - - - -@@ -63,7 +63,7 @@ cfg_file=@sysconfdir@/objects/localhost. - # 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 - - - -@@ -79,7 +79,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 - - - -@@ -92,7 +92,7 @@ precached_object_file=@localstatedir@/ob - # defined as macros in this file and restrictive permissions (600) - # can be placed on this file. - --resource_file=@sysconfdir@/resource.cfg -+resource_file=@sysconfdir@/private/resource.cfg - - - -@@ -102,7 +102,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@/spool/nagios/status.dat - - - -@@ -151,14 +151,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 - - - -@@ -176,7 +176,7 @@ lock_file=@subsyslockfile@ - # is created, used, and deleted throughout the time that Nagios is - # running. - --temp_file=@localstatedir@/nagios.tmp -+temp_file=@localstatedir@/spool/nagios/nagios.tmp - - - -@@ -243,7 +243,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@/spool/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 - - - -@@ -1292,7 +1292,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 2019-01-16 13:50:29.366875513 -0600 -+++ ./sample-config/template-object/commands.cfg.in 2019-01-16 13:51:22.140000845 -0600 -@@ -241,7 +241,7 @@ define command { - 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 - } - - -@@ -249,5 +249,5 @@ define command { - 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 ./startup/default-init.in.fix_localstatedir ./startup/default-init.in ---- ./startup/default-init.in.fix_localstatedir 2019-01-16 14:16:54.874599523 -0600 -+++ ./startup/default-init.in 2019-01-16 14:22:55.103634621 -0600 -@@ -41,12 +41,12 @@ - # Our install-time configuration. - NagiosBin=@bindir@/@nagios_name@ - NagiosCfgFile=@sysconfdir@/nagios.cfg --NagiosCfgtestFile=@localstatedir@/nagios.configtest --NagiosStatusFile=@localstatedir@/status.dat --NagiosRetentionFile=@localstatedir@/retention.dat --NagiosCommandFile=@localstatedir@/rw/nagios.cmd -+NagiosCfgtestFile=@localstatedir@/spool/nagios/nagios.configtest -+NagiosStatusFile=@localstatedir@/spool/nagios/status.dat -+NagiosRetentionFile=@localstatedir@/spool/nagios/retention.dat -+NagiosCommandFile=@localstatedir@/spool/nagios/cmd/nagios.cmd - NagiosRunFile=@subsyslockfile@ --NagiosVarDir=@localstatedir@ -+NagiosVarDir=@localstatedir@/spool/nagios/ - NagiosCGIDir=@cgibindir@ - NagiosUser=@nagios_user@ - NagiosGroup=@nagios_grp@ -diff -up ./startup/default-service.in.fix_localstatedir ./startup/default-service.in ---- ./startup/default-service.in.fix_localstatedir 2019-01-16 14:23:17.575262522 -0600 -+++ ./startup/default-service.in 2019-01-16 14:23:39.273903222 -0600 -@@ -8,7 +8,7 @@ Type=forking - ExecStartPre=@bindir@/nagios -v @sysconfdir@/nagios.cfg - ExecStart=@bindir@/nagios -d @sysconfdir@/nagios.cfg - ExecStop=@BIN_KILL@ -s TERM ${MAINPID} --ExecStopPost=@BIN_RM@ -f @localstatedir@/rw/nagios.cmd -+ExecStopPost=@BIN_RM@ -f @localstatedir@/spool/nagios/cmd/nagios.cmd - ExecReload=@BIN_KILL@ -s HUP ${MAINPID} - - [Install] -diff -up ./t-tap/Makefile.in.fix_localstatedir ./t-tap/Makefile.in ---- ./t-tap/Makefile.in.fix_localstatedir 2019-01-16 14:24:14.944312569 -0600 -+++ ./t-tap/Makefile.in 2019-01-16 14:24:42.359858604 -0600 -@@ -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=@cgibindir@ diff --git a/nagios-0010-remove-information-leak.patch b/nagios-0010-remove-information-leak.patch deleted file mode 100644 index 46c62e1..0000000 --- a/nagios-0010-remove-information-leak.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -up ./cgi/extinfo.c.rm_youtube ./cgi/extinfo.c ---- ./cgi/extinfo.c.rm_youtube 2018-11-28 14:23:47.609805066 -0600 -+++ ./cgi/extinfo.c 2018-11-28 14:28:35.513997180 -0600 -@@ -557,27 +557,6 @@ void document_header(int use_stylesheet) - printf("\n", url_stylesheets_path, NAGFUNCS_CSS); - } - -- if (display_type == DISPLAY_HOST_INFO) -- vidurl = "https://www.youtube.com/embed/n3QEAf-MxY4"; -- else if(display_type == DISPLAY_SERVICE_INFO) -- vidurl = "https://www.youtube.com/embed/f_knwQOS6FI"; -- -- if (enable_page_tour == TRUE && vidurl) { -- printf("\n", url_js_path, JQUERY_JS); -- printf("\n", url_js_path, NAGFUNCS_JS); -- printf("\n"); -- } -- - printf("\n"); - - printf("\n"); -diff -up ./cgi/status.c.rm_youtube ./cgi/status.c ---- ./cgi/status.c.rm_youtube 2018-11-28 14:28:56.072653859 -0600 -+++ ./cgi/status.c 2018-11-28 14:32:05.038498204 -0600 -@@ -537,31 +537,8 @@ void document_header(int use_stylesheet) - /* JS function to append content to elements on page */ - printf("\n", url_js_path, NAGFUNCS_JS); -- -- printf("\n"); -- } -+ } - - - -diff -up ./html/main.php.rm_youtube ./html/main.php ---- ./html/main.php.rm_youtube 2018-11-28 14:34:59.249588949 -0600 -+++ ./html/main.php 2018-11-28 14:39:03.703506666 -0600 -@@ -19,20 +19,7 @@ $this_year = '2018'; - - - - -- -- -- -- - - > - diff --git a/nagios-0011-remove-rpmbuild.patch b/nagios-0011-remove-rpmbuild.patch deleted file mode 100644 index 77c6ce6..0000000 --- a/nagios-0011-remove-rpmbuild.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up ./contrib/Makefile.in.remove_rpmbuild ./contrib/Makefile.in ---- ./contrib/Makefile.in.remove_rpmbuild 2019-01-16 15:00:18.627548108 -0600 -+++ ./contrib/Makefile.in 2019-01-16 15:00:38.756215308 -0600 -@@ -84,35 +84,3 @@ $(CGI_O): $(CGI_C) - - %.cgi : %.c - $(CC) $(CFLAGS) $(LDFLAGS) $< $(CGI_O) -o $@ -- --############################################################################## --# rpm making automation for CentOS/RHEL. -- --ARCH ?= $(shell uname -m) --ifeq ($(ARCH),x86_64) --RPM_ARCH := x86_64 --else -- ifeq ($(ARCH),i686) --RPM_ARCH := i386 -- else -- ifeq ($(ARCH),aarch64) --RPM_ARCH := aarch64 -- else --$(error Unknown arch "$(ARCH)".) -- endif -- endif --endif -- --rpm: -- # create nagios tar ball. -- @(cd ..;rm -f nagios-@VERSION@) -- @(cd ..;ln -s . nagios-@VERSION@) -- @(cd ..;tar zhcf nagios-@VERSION@.tar.gz --exclude nagios-@VERSION@/nagios-@VERSION@.tar.gz --exclude nagios-@VERSION@/nagios-@VERSION@ --exclude RCS --exclude CVS --exclude build-* --exclude *~ --exclude .git* nagios-@VERSION@/) -- @(cd ..;rm -f nagios-@VERSION@) -- # build the rpm using rpmbuild from ./rmbuild as topdir -- @rm -rf rpmbuild && mkdir -p rpmbuild/SOURCES -- @cp ../nagios-@VERSION@.tar.gz rpmbuild/SOURCES/nagios-@VERSION@.tar.gz -- @rpmbuild -ba --define "_topdir ${PWD}/rpmbuild" ../nagios.spec -- @mv rpmbuild/RPMS/$(RPM_ARCH)/*.rpm . -- @ls -l *.rpm -- diff --git a/nagios-0012-fix-spool.patch b/nagios-0012-fix-spool.patch deleted file mode 100644 index f8979d6..0000000 --- a/nagios-0012-fix-spool.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up ./contrib/eventhandlers/disable_active_service_checks.fix_spool ./contrib/eventhandlers/disable_active_service_checks ---- ./contrib/eventhandlers/disable_active_service_checks.fix_spool 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/disable_active_service_checks 2017-09-19 15:21:28.173643069 -0400 -@@ -16,7 +16,7 @@ - - printfcmd="/usr/bin/printf" - --CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/spool/nagios/" - - # get the current date/time in seconds since UNIX epoch - datetime=`date +%s` -diff -up ./contrib/eventhandlers/disable_notifications.fix_spool ./contrib/eventhandlers/disable_notifications ---- ./contrib/eventhandlers/disable_notifications.fix_spool 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/disable_notifications 2017-09-19 15:21:28.198643530 -0400 -@@ -14,7 +14,7 @@ - - printfcmd="/usr/bin/printf" - --CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/spool/nagios/" - - # get the current date/time in seconds since UNIX epoch - datetime=`date +%s` -diff -up ./contrib/eventhandlers/enable_active_service_checks.fix_spool ./contrib/eventhandlers/enable_active_service_checks ---- ./contrib/eventhandlers/enable_active_service_checks.fix_spool 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/enable_active_service_checks 2017-09-19 15:21:28.199643549 -0400 -@@ -16,7 +16,7 @@ - - printfcmd="/usr/bin/printf" - --CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/spool/nagios/" - - # get the current date/time in seconds since UNIX epoch - datetime=`date +%s` -diff -up ./contrib/eventhandlers/submit_check_result.fix_spool ./contrib/eventhandlers/submit_check_result ---- ./contrib/eventhandlers/submit_check_result.fix_spool 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/submit_check_result 2017-09-19 15:21:28.200643567 -0400 -@@ -24,7 +24,7 @@ - - echocmd="/bin/echo" - --CommandFile="/usr/local/nagios/var/rw/nagios.cmd" -+CommandFile="/var/spool/nagios/" - - # get the current date/time in seconds since UNIX epoch - datetime=`date +%s` diff --git a/nagios-0013-fix-plugin.patch b/nagios-0013-fix-plugin.patch deleted file mode 100644 index f090665..0000000 --- a/nagios-0013-fix-plugin.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up ./contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler.fix_plugin ./contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler ---- ./contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler.fix_plugin 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler 2017-09-19 15:21:28.201643586 -0400 -@@ -21,7 +21,7 @@ - # - - # Location of the submit_check_result_via_nsca script --SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca" -+SubmitCmd="/usr/lib64/nagios/plugins/eventhandlers/submit_check_result_via_nsca" - - # Convert the state string to the corresponding return code - return_code=-1 -diff -up ./contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.fix_plugin ./contrib/eventhandlers/redundancy-scenario1/handle-master-host-event ---- ./contrib/eventhandlers/redundancy-scenario1/handle-master-host-event.fix_plugin 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2017-09-19 15:21:28.202643604 -0400 -@@ -13,7 +13,7 @@ echocmd="/bin/echo" - mailcmd="/bin/mail" - - # Location of the event handlers --eventhandlerdir="/usr/local/nagios/libexec/eventhandlers" -+eventhandlerdir="/usr/lib64/nagios/plugins/eventhandlers" - - - # Only take action on hard host states... -diff -up ./contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.fix_plugin ./contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event ---- ./contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event.fix_plugin 2017-08-24 17:43:48.000000000 -0400 -+++ ./contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2017-09-19 15:21:28.203643623 -0400 -@@ -13,7 +13,7 @@ echocmd="/bin/echo" - mailcmd="/bin/mail" - - # Location of the event handlers --eventhandlerdir="/usr/local/nagios/libexec/eventhandlers" -+eventhandlerdir="/usr/lib64/nagios/plugins/eventhandlers" - - - # Only take action on hard service states... diff --git a/nagios-0014-fix-uidgid.patch b/nagios-0014-fix-uidgid.patch deleted file mode 100644 index d88b880..0000000 --- a/nagios-0014-fix-uidgid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./startup/default-service.in.fix_uidgid ./startup/default-service.in ---- ./startup/default-service.in.fix_uidgid 2019-02-22 11:57:38.432525592 -0500 -+++ ./startup/default-service.in 2019-02-22 11:58:03.823003073 -0500 -@@ -5,6 +5,8 @@ After=network.target local-fs.target - - [Service] - Type=forking -+User=nagios -+Group=nagios - ExecStartPre=@bindir@/nagios -v @sysconfdir@/nagios.cfg - ExecStart=@bindir@/nagios -d @sysconfdir@/nagios.cfg - ExecStop=@BIN_KILL@ -s TERM ${MAINPID} diff --git a/nagios-socket.te b/nagios-socket.te deleted file mode 100644 index d9ed56b..0000000 --- a/nagios-socket.te +++ /dev/null @@ -1,16 +0,0 @@ -module nagios-socket 1.1; - -require { - type nagios_t; - type nagios_spool_t; - class sock_file { write create unlink }; - class unix_stream_socket connectto; -} - - -#============= nagios_t ============== - -#!!!! This avc is allowed in the current policy -allow nagios_t nagios_spool_t:sock_file { write create unlink }; -#!!!! This avc can be allowed using the boolean 'daemons_enable_cluster_mode' -allow nagios_t self:unix_stream_socket connectto; diff --git a/nagios.README.SELinux.rst b/nagios.README.SELinux.rst deleted file mode 100644 index c653514..0000000 --- a/nagios.README.SELinux.rst +++ /dev/null @@ -1,19 +0,0 @@ -================ -Nagios and SELinux -================ - -While there is an Nagios policy in the default Selinux policies, it does -not meet the needs of the current Nagios software. In working with the -SELinux security group, there is now a need for non-core packages to -carry their own policy in a spec file. - -Following the steps in -https://fedoraproject.org/wiki/SELinux/IndependentPolicy we are adding -the needed subpackage and files. - -This policy DOES NOT REPLACE THE CORE POLICY in the selinux-policies -package. This is only a supplement that the nrpe package needs due to -changes from the older base policy. - -Please report bugs as needed and we will try to get them fixed as soon -as possible. diff --git a/nagios.htaccess b/nagios.htaccess deleted file mode 100644 index 4d96298..0000000 --- a/nagios.htaccess +++ /dev/null @@ -1,50 +0,0 @@ -ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/ - - Options ExecCGI - order deny,allow - deny from all - allow from 127.0.0.1 - AuthType Basic - AuthUserFile /etc/nagios/passwd - AuthName "nagios" - require valid-user - - -Alias /nagios/ /usr/share/nagios/html/ - - Options None - order deny,allow - deny from all - allow from 127.0.0.1 - AuthType Basic - AuthUserFile /etc/nagios/passwd - AuthName "nagios" - require valid-user - - -# For SSL-servers -# -# Options ExecCGI -# SSLRequireSSL -# order deny,allow -# deny from all -# allow from 127.0.0.1 -# AuthType Basic -# AuthUserFile /etc/nagios/passwd -# AuthName "nagios" -# require valid-user -# -# -#Alias /nagios/ /usr/share/nagios/html/ -# -# Options None -# SSLRequireSSL -# order deny,allow -# deny from all -# allow from 127.0.0.1 -# AuthType Basic -# AuthUserFile /etc/nagios/passwd -# AuthName "nagios" -# require valid-user -# - diff --git a/nagios.htpasswd b/nagios.htpasswd deleted file mode 100644 index 8fd2ef0..0000000 --- a/nagios.htpasswd +++ /dev/null @@ -1,2 +0,0 @@ -nagiosadmin:RbdO4ou4PNyMg - diff --git a/nagios.internet.cfg b/nagios.internet.cfg deleted file mode 100644 index 19e2dfd..0000000 --- a/nagios.internet.cfg +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################## -# internet.cfg - sample config file for Fedoras Nagios -# -# 2008-07-03 created Robert M. Albrecht -# -# NOTES: This config file is a sample for monitoring some internet hosts. -# -############################################################################### - -define host{ - name template-internet-host - use generic-host - register 0 - max_check_attempts 5 - contacts nagiosadmin - parents localhost - -} - -define host{ - use template-internet-host - host_name Google - address www.google.com - notes Googles Website defined by sample config - notes_url http://www.google.com - action_url http://en.wikipedia.org/wiki/Google - } - -define hostgroup{ - hostgroup_name InternetHosts - alias Internet Hosts - members Google - } - -define service{ - use generic-service - hostgroup_name InternetHosts - service_description PING - check_command check_ping!200.0,20%!600.0,60% - } - -define service{ - use generic-service - hostgroup_name InternetHosts - service_description HTTP - check_command check_http - } - -define servicegroup{ - servicegroup_name WebSites - alias Internet Hosts - members Google,PING,Google,HTTP - } - - diff --git a/nagios.logrotate b/nagios.logrotate deleted file mode 100644 index 0fa52c8..0000000 --- a/nagios.logrotate +++ /dev/null @@ -1,15 +0,0 @@ -# Important! Nagios rotates its own logs. Only enable this logrotate if you -# know what you are doing! - -# For more information please see "log_rotate_method" in: -# /etc/nagios/nagios.cfg - -# ----- logrotate config ------------- -#/var/log/nagios/*.log { -# missingok -# weekly -# notifempty -# nocompress -# create 644 nagios nagios -#} - diff --git a/nagios.spec b/nagios.spec deleted file mode 100644 index 6710f9d..0000000 --- a/nagios.spec +++ /dev/null @@ -1,1161 +0,0 @@ -%global _hardened_build 1 - -Name: nagios -Version: 4.4.3 -Release: 6%{?dist} - -Summary: Host/service/network monitoring program - -License: GPLv2 -URL: https://www.nagios.org/projects/nagios-core/ -Source0: https://github.com/NagiosEnterprises/nagioscore/archive/nagios-%{version}.tar.gz#/nagioscore-nagios-%{version}.tar.gz -Source1: nagios.logrotate -Source2: nagios.htaccess -Source3: nagios.internet.cfg -Source4: nagios.htpasswd -Source5: nagios.upgrade_to_v4.ReadMe -Source6: nagios.upgrade_to_v4.sh -Source8: nagios.tmpfiles.conf -# PNG files from the old nagios-0010-Added-several-images-to-the-sample-config.patch -Source10: printer.png -Source11: router.png -Source12: switch.png -Source13: nagios.README.SELinux.rst -Source14: nagios_epel7.te -Source15: nagios_epel.fc -Source16: nagios_epel6.te - -# Patch 0 should be a patch that we get from the maint git tree in -# order to fix any items upstream wanted. -#Patch0: nagios-0000-git201706.patch -Patch1: nagios-0001-default-init.patch -# Sent upstream -Patch2: nagios-0002-Fix-installation-of-httpd-conf.d-config-file.patch -Patch3: nagios-0003-Install-config-files-too.patch -Patch4: nagios-0004-Fix-path-to-CGI-executables.patch -Patch5: nagios-0005-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch -Patch6: nagios-0006-Added-several-images-to-the-sample-config-revb.patch -#Patch7: nagios-0007-Apache-2.4-configuration-fix-for-Fedora-18.patch -Patch8: nagios-0008-Add-cfg_dir-etc-nagios-conf.d-to-the-main-nagios-con.patch -Patch9: nagios-0009-fix-localstatedir-for-linux.patch -## This has been requested for security groups not wanting to leak -## their nagios location. -Patch10: nagios-0010-remove-information-leak.patch -## Make it so it knows about all the arches fedora cares about -Patch11: nagios-0011-remove-rpmbuild.patch -Patch12: nagios-0012-fix-spool.patch -Patch13: nagios-0013-fix-plugin.patch -Patch14: nagios-0014-fix-uidgid.patch - -BuildRequires: doxygen -BuildRequires: gcc -BuildRequires: gd-devel > 1.8 -BuildRequires: gperf -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: perl-generators -BuildRequires: perl(CPAN) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(ExtUtils::Embed) -BuildRequires: perl(Test::Harness) -%if 0%{?el6}%{?fedora} -BuildRequires: perl(Test::HTML::Lint) -%endif -BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Simple) - -# For up-to-date config.sub and config.guess -BuildRequires: libtool - -# For selinux tools -BuildRequires: checkpolicy, selinux-policy-devel - -%if 0%{?el7} || 0%{?fedora} > 20 -# For necessary macros -BuildRequires: systemd -%endif - -Requires: httpd -Requires: php -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: mailx -Requires: nagios-common -Requires: user(nagios) -Requires: group(nagios) - -Requires(pre): group(nagios) -Requires(pre): user(nagios) -%if 0%{?el7} || 0%{?fedora} > 20 -# For necessary macros -BuildRequires: systemd -%else -Requires(preun): initscripts, chkconfig -Requires(post): initscripts, chkconfig -Requires(postun): initscripts -%endif - -%description -Nagios is a program that will monitor hosts and services on your -network. It has the ability to send email or page alerts when a -problem arises and when a problem is resolved. Nagios is written -in C and is designed to run under Linux (and some other *NIX -variants) as a background process, intermittently running checks -on various services that you specify. - -The actual service checks are performed by separate "plugin" programs -which return the status of the checks to Nagios. The plugins are -available at https://github.com/nagios-plugins/nagios-plugins - -This package provides the core program, web interface, and documentation -files for Nagios. Development files are built as a separate package. - -%package common -Summary: Provides common directories, uid and gid among nagios-related packages -Requires(pre): shadow-utils -Requires(post): shadow-utils -Provides: user(nagios) -Provides: group(nagios) - - -%description common -Provides common directories, uid and gid among nagios-related packages. - - -%package devel -Summary: Provides include files that Nagios-related applications may compile against -Requires: %{name} = %{version}-%{release} - - -%description devel -Nagios is a program that will monitor hosts and services on your -network. It has the ability to email or page you when a problem arises -and when a problem is resolved. Nagios is written in C and is -designed to run under Linux (and some other *NIX variants) as a -background process, intermittently running checks on various services -that you specify. - -This package provides include files that Nagios-related applications -may compile against. - -%if 0%{?rhel} > 5 -%package selinux -Summary: SELinux context for %{name} -Requires: %name = %version-%release -Requires(post): policycoreutils -Requires(postun): policycoreutils - - -%description selinux -SElinux context for %{name}. -%endif - -%package contrib -Summary: Eventhandlers contributed to nagios -Requires: %name = %version-%release - -%description contrib -Various contributed items used by plugins and other tools. - -%prep -%setup -q -n nagioscore-nagios-%{version} - -# patch0 would go here -%patch1 -p1 -b .fix_el6_init -%patch2 -p1 -b .fix_httpd_conf_d -%patch3 -p0 -b .install_config -%patch4 -p1 -b .fix_path_to_cgi -%patch5 -p1 -b .fix_path_to_passwd -%patch6 -p1 -b .more_images - -#%patch8 -p1 -b .conf_d -%patch9 -p1 -b .fix_localstatedir -%patch10 -p1 -b .remove_3rdparty_links -%patch11 -p1 -b .remove_rpmbuild -%patch12 -p1 -b .fix_spool -%patch13 -p1 -b .fix_plugin -%patch14 -p1 -b .fix_uidgid - -install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/ - - -%build -%configure \ - --prefix=%{_datadir}/%{name} \ - --exec-prefix=%{_localstatedir}/lib/%{name} \ - --libdir=%{_libdir}/%{name} \ - --bindir=%{_sbindir} \ - --datadir=%{_datadir}/%{name}/html \ - --libexecdir=%{_libdir}/%{name}/plugins \ - --localstatedir=%{_localstatedir} \ - --with-checkresult-dir=%{_localstatedir}/spool/%{name}/checkresults \ - --with-cgibindir=%{_libdir}/nagios/cgi \ - --sysconfdir=%{_sysconfdir}/%{name} \ - --with-cgiurl=/%{name}/cgi-bin \ - --with-command-user=apache \ - --with-command-group=apache \ - --with-gd-lib=%{_libdir} \ - --with-gd-inc=%{_includedir} \ - --with-htmlurl=/%{name} \ - --with-lockfile=%{_localstatedir}/run/%{name}/%{name}.pid \ -%if 0%{?rhel} == 6 - --with-mail=/bin/mail \ - --with-initdir=%{_initrddir} \ - --with-init-type=sysv \ -%else - --with-mail=/usr/bin/mail \ - --with-initdir=%{_unitdir} \ - --with-init-type=systemd \ -%endif - --with-nagios-user=nagios \ - --with-nagios-grp=nagios \ - --with-template-objects \ - --with-template-extinfo \ - --enable-event-broker \ - STRIP=/bin/true -make %{?_smp_mflags} all - -### Build our documentation -%{__make} dox - -### Apparently contrib does not obey configure ! -%{__make} %{?_smp_mflags} -C contrib - - -sed -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess -cp -f %{SOURCE3} internet.cfg -cp -f %{SOURCE5} UpgradeToVersion4.ReadMe -cp -f %{SOURCE6} UpgradeToVersion4.sh -echo >> html/stylesheets/common.css - -%if 0%{?rhel} > 5 -## SELinux configs -mkdir selinux -install -pm 644 %{SOURCE13} README.SELinux.rst -%if 0%{?rhel} == 6 -cp -p %{SOURCE16} selinux/%{name}_epel.te -%else -cp -p %{SOURCE14} selinux/%{name}_epel.te -%endif -cp -p %{SOURCE15} selinux/%{name}_epel.fc -touch selinux/%{name}_epel.if -make -f %{_datadir}/selinux/devel/Makefile -%endif - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=%{buildroot} INIT_OPTS="" INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR="%{_libdir}/%{name}/cgi-bin" CFGDIR="%{_sysconfdir}/%{name}" fullinstall - -# relocated to sbin (Fedora-specific) -install -d -m 0755 %{buildroot}%{_bindir} -mv %{buildroot}%{_sbindir}/nagiostats %{buildroot}%{_bindir}/nagiostats - -install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/private -mv %{buildroot}%{_sysconfdir}/%{name}/resource.cfg %{buildroot}%{_sysconfdir}/%{name}/private/resource.cfg - -install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/passwd - -# Install header-file -install -D -m 0644 include/locations.h %{buildroot}%{_includedir}/%{name}/locations.h - -# Install logrotate rule -install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} - -# Make room for event-handlers -install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers -install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers/distributed-monitoring/ -install -d -m 0755 %{buildroot}%{_libdir}/%{name}/plugins/eventhandlers/redundancy-scenario1/ - -install -d -m 0775 %{buildroot}%{_localstatedir}/spool/%{name}/cmd -install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name} - -# Make a run directory -install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name} - -# Make logdirs -install -d -m 0775 %{buildroot}/%{_localstatedir}/log/ -install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/ -install -d -m 0775 %{buildroot}/%{_localstatedir}/log/%{name}/archives - -# Use systemd unit on rhel7 or any supported Fedora -%if 0%{?el7} || 0%{?fedora} > 20 -# Install systemd entry -install -D -m 0644 -p %{SOURCE8} %{buildroot}%{_tmpfilesdir}/%{name}.conf - -# Remove SystemV init-script -rm -f %{buildroot}%{_initrddir}/nagios -%endif - -# Fix permissions - FIXME remove this when unneeded -chmod 755 %{buildroot}%{_sbindir}/nagios - -# Install documentation -install -d -m 0755 %{buildroot}%{_datadir}/nagios/html/docs -%{__cp} -a Documentation/html/* %{buildroot}%{_datadir}/nagios/html/docs - -%if 0%{?rhel} >5 -# Selinux configs -install -p -m 644 -D %{name}_epel.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}_epel.pp -%endif - -### CONTRIB ITEMS TAKEN FROM UPSTREAM NAGIOS SPEC -make install -C contrib DESTDIR="%{buildroot}" INSTALL_OPTS="" -install -p -m 644 contrib/eventhandlers/disable_active_service_checks %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/ -install -p -m 644 contrib/eventhandlers/disable_notifications %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/ -install -p -m 644 contrib/eventhandlers/enable_active_service_checks %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/ -install -p -m 644 contrib/eventhandlers/enable_notifications %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/ -install -p -m 644 contrib/eventhandlers/submit_check_result %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/ - -install -p -m 644 contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/distributed-monitoring/ -install -p -m 644 contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/distributed-monitoring/ -install -p -m 644 contrib/eventhandlers/redundancy-scenario1/handle-master-host-event %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/redundancy-scenario1/ -install -p -m 644 contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event %{buildroot}%{_libdir}/nagios/plugins/eventhandlers/redundancy-scenario1/ - -%{__mv} contrib/README contrib/README.contrib - -%pre common -getent group nagios >/dev/null || groupadd -r nagios -getent passwd nagios >/dev/null || useradd -r -g nagios -d %{_localstatedir}/spool/%{name} -s /sbin/nologin nagios -exit 0 - - -%post -%{_sbindir}/usermod -a -G %{name} apache || : - -%if 0%{?el7} || 0%{?fedora} > 20 -%systemd_post %{name}.service > /dev/null 2>&1 || : -%else -if [ $1 -eq 1 ]; then - # Initial installation - /sbin/chkconfig --add %{name} || : -fi -%endif - -%if 0%{?el5}%{?el6} -/sbin/service httpd condrestart > /dev/null 2>&1 || : -if [ $1 -gt 1 ]; then - /sbin/service nagios reload > /dev/null 2>&1 || : -fi -%else -/usr/bin/systemctl condrestart httpd > /dev/null 2>&1 || : - -if [ $1 -gt 1 ]; then - /usr/bin/systemctl reload nagios > /dev/null 2>&1 || : -fi -%endif - -%preun -%if 0%{?el7} || 0%{?fedora} > 20 -%systemd_preun %{name}.service -%else -if [ $1 -eq 0 ]; then - # Package removal, not upgrade - /sbin/service %{name} stop >/dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : -fi -%endif - - -%postun -%if 0%{?el5}%{?el6} -/sbin/service httpd condrestart > /dev/null 2>&1 || : -%else -/usr/bin/systemctl condrestart httpd > /dev/null 2>&1 || : -%endif - - -%if 0%{?fedora} > 20 -%triggerun -- %{name} < 3.5.1-2 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply opensips -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -%endif - -%if 0%{?rhel} >5 -%post selinux -%if 0%{?el5}%{?el6} -if [ "$1" -le "1" ]; then # First install - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null || : - fixfiles -R %{name} restore || : - /sbin/service %{name} condrestart > /dev/null 2>&1 || : -fi -%else -if [ "$1" -le "1" ]; then # First install - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null || : - fixfiles -R %{name} restore || : - %systemd_postun_with_restart %{name}.service -fi -%endif -%endif - -%if 0%{?rhel} >5 -%preun selinux -%if 0%{?el6} -if [ "$1" -lt "1" ]; then # Final removal - semodule -r %{name}_epel 2>/dev/null || : - fixfiles -R %{name} restore || : - /sbin/service %{name} condrestart > /dev/null 2>&1 || : -fi -%else -if [ "$1" -lt "1" ]; then # Final removal - semodule -r %{name}_epel 2>/dev/null || : - fixfiles -R %{name} restore || : - %systemd_postun_with_restart %{name}.service -fi -%endif -%endif - -%if 0%{?rhel} >5 -%postun selinux -if [ "$1" -ge "1" ]; then # Upgrade - # Replaces the module if it is already loaded - semodule -i %{_datadir}/selinux/packages/%{name}/%{name}_epel.pp 2>/dev/null || : - # no need to restart the daemon -fi -%endif - - - -%files -%dir %{_libdir}/%{name}/cgi-bin -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/html -%doc %{_datadir}/%{name}/html/docs -%doc Changelog INSTALLING LICENSE README.md UPGRADING UpgradeToVersion4.ReadMe UpgradeToVersion4.sh -%doc internet.cfg -%{_datadir}/%{name}/html/[^cd]* -%{_datadir}/%{name}/html/contexthelp/ -%{_datadir}/%{name}/html/d3/ - -%{_sbindir}/* -%{_bindir}/* -%{_libdir}/%{name}/cgi-bin/*cgi -%if 0%{?el7} || 0%{?fedora} > 20 -%{_unitdir}/%{name}.service -%{_tmpfilesdir}/%{name}.conf -%else -%{_initrddir}/nagios -%endif -%config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/*cfg -%config(noreplace) %{_sysconfdir}/%{name}/objects/*cfg -%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private -%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/objects - -%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg -%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/passwd -%attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php -%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd -%attr(0750,nagios,nagios) %dir %{_localstatedir}/run/%{name} -%attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name} -%attr(0750,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives -%attr(0770,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults - -%files common -%dir %{_sysconfdir}/%{name} -%dir %{_libdir}/%{name} -%attr(0755,root,root) %dir %{_libdir}/%{name}/plugins -%attr(0755,root,root) %dir %{_libdir}/%{name}/plugins/eventhandlers/ -%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name} - - -%files devel -%{_includedir}/%{name} -%attr(0644,root,root) %{_libdir}/%{name}/libnagios.a - -%if 0%{?rhel} > 5 -%files selinux -%doc README.SELinux.rst -%{_datadir}/selinux/packages/%{name}/nagios_epel.pp -%endif - -%files contrib -%doc contrib/README.contrib -%attr(0750,root,root) %{_libdir}/%{name}/plugins/eventhandlers/* -%{_libdir}/%{name}/cgi/ - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 4.4.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 31 2019 Jitka Plesnikova - 4.4.3-5 -- Perl 5.30 rebuild - -* Fri Feb 22 2019 Stephen Smoogen - 4.4.3-4 -- Fix BZ#1674258 add explicite User and Group to systemctl startup. -- Problem was missed because some config files had this set in them - -* Tue Feb 5 2019 Stephen Smoogen - 4.4.3-3 -- Fix BZ#1672027 -- Patch for daemon did not have enough endif in them. However test looks superfluous - -* Fri Feb 01 2019 Fedora Release Engineering - 4.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 16 2019 Stephen Smoogen - 4.4.3-1 -- Incorporate many fixes from Justin Paulsen THANKS!!! -- Update to 4.4.3 for CVE fixes -- BZ#1661479 -- BZ#1661480 -- BZ#1665200 -- BZ#1665201 -- BZ#1665206 -- BZ#1665207 -- BZ#1665209 -- BZ#1665210 -- Fix BZ#1666209 Add RuntimeDirectory too systemd - -* Fri Nov 30 2018 Stephen Smoogen - 4.4.2-3 -- Remove systemd startup since built in works properly -- Incorporate fixes from patch14 into patch9 - -* Thu Nov 29 2018 Stephen Smoogen - 4.4.2-2 -- Fix init-type and initdir for systemd and sysv - -* Wed Nov 28 2018 Justin Paulsen 4.4.2-1 -- Bumped to version 4.4.2 -- Updated patches 0001,0002,0003,0006,0009,0010,0011 to reflect upstream changes -- Updates to nagios.spec (this file) to cleanup un-needed elements and - adjust/fix as required -- As a result of the cleanup I have added a patch nagios-0014-fix-resource.cfg-path.patch - -* Tue Jul 24 2018 Stephen Smoogen - 4.3.4-13 -- Remove section which unset nagios Fix BZ#1568273 -- Remove /etc/nagios/conf.d Fix BZ#1504306 -- Change perms on dir Fix BZ#1579935 -- Close BZ#1273154 -- Hopefully Fix BZ#1201849 -- Hopefully Fix BZ#1476238 -- Hopefully Fix BZ#1494292 - -* Fri Jul 13 2018 Fedora Release Engineering - 4.3.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Jitka Plesnikova - 4.3.4-11 -- Perl 5.28 rebuild - -* Thu Apr 26 2018 Stephen Smoogen - 4.3.4-10 -- Fix systemd failures due to old versioning. - -* Tue Feb 20 2018 Stephen Smoogen - 4.3.4-9 -- Add buildrequires for gcc - -* Thu Feb 08 2018 Fedora Release Engineering - 4.3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Nov 24 2017 Robert Scheck - 4.3.4-7 -- Fix initscript stop action for RHEL/CentOS 6 (#1515445 #c11) - -* Fri Nov 24 2017 Robert Scheck - 4.3.4-6 -- Fix shell syntax error in initscript for RHEL/CentOS 6 - -* Mon Nov 20 2017 Stephen Smoogen - 4.3.4-5 -- Fix entry for nagios not stopping correctly sometimes -- Try to make kill smarter. Needs to use the RH killproc instead - -* Wed Oct 4 2017 Stephen Smoogen - 4.3.4-4 -- Fix nagios su lines to work on rhel6 - -* Wed Sep 20 2017 Stephen Smoogen - 4.3.4-3 -- Try to fix error on update with systemctl -- Find all the parts i forgot to send to dev null - -* Tue Sep 19 2017 Stephen Smoogen - 4.3.4-3 -- Fix conflict between nagios and nagios-contrib -- Fix reload problem in nagios systemd - -* Tue Sep 19 2017 Stephen Smoogen - 4.3.4-2 -- Merge patches from EPEL tree to master -- Fix contrib entries -- Use rpmlint to fix items in spec file - -* Tue Sep 19 2017 Stephen Smoogen - 4.3.4-1 -- Update to 4.3.4 -- Rebase patches to 4.3.4 -- Change configure to match upstream recommendations. -- Get the docs from doxygen added. -- Remove the rpmbuild in contrib so other arches can build - -* Wed Aug 2 2017 Stephen Smoogen - 4.3.2-12 -- Add a contrib section for event handlers -- Fix BZ#1476346 -- Fix BZ#1476238 -- Remove some contrib makes as not currently implemented for anything other than x86_64 - -* Wed Jul 26 2017 Stephen Smoogen - 4.3.2-11 -- Fix a service problem again. Lost patch -- nagios script - -* Wed Jul 26 2017 Stephen Smoogen - 4.3.2-10 -- Fix fix - -* Wed Jul 26 2017 Stephen Smoogen - 4.3.2-9 -- Fix RHBZ#1475447 -- How the henry do you mess that up over 4 releases? - -* Tue Jul 25 2017 Stephen Smoogen - 4.3.2-8 -- Fix the systemd service file reload and other issues - -* Tue Jul 25 2017 Stephen Smoogen - 4.3.2-7 -- Update initd patch to move mktemp from /tmp to /var/log/nagios where it has permission to write -- Update patches so they aren't offset - -* Mon Jul 24 2017 Stephen Smoogen - 4.3.2-7 -- And remember to push the release number up one -- Add entries for RHEL-6 - -* Fri Jul 21 2017 Stephen Smoogen - 4.3.2-6 -- Fix nagios selinux entries - -* Wed Jun 28 2017 Stephen Smoogen - 4.3.2-5 -- Added fix for selinux from Patrick Uiterwijk - -* Fri Jun 23 2017 Stephen Smoogen - 4.3.2-4 -- Fix a problem with systemctl scripts. Mea culpa, mea culpa - -* Wed Jun 14 2017 Stephen Smoogen - 4.3.2-3 -- Update to latest in git -- Fix bug 1428111 -- Fix bug 1426816 -- Fix bug 1218320 - -* Mon Jun 05 2017 Jitka Plesnikova - 4.3.2-2 -- Perl 5.26 rebuild - -* Thu May 11 2017 Stephen Smoogen - 4.3.2-1 -- Updated from 4.3.1 maint to 4.3.2 -- Update selinux - -* Thu Apr 20 2017 Stephen Smoogen - 4.3.1-4git -- I broke several peoples names because the UTF-8 character was removed. My apologies. - -* Thu Apr 20 2017 Stephen Smoogen - 4.3.1-3git -- fix selinux items -- change name to work of selinux module not to conflict with shipped one. - -* Thu Apr 20 2017 Stephen Smoogen - 4.3.1-2 -- Update to the maintenance version -- Add a starting selinux options -- Update patches to deal with newer code. - -* Fri Feb 24 2017 Stephen Smoogen - 4.3.1-1 -- Updated to 4.3.1 -- Removed (de) entries in the spec file for 2 reasons. - - Some characters break RHEL6 - - The text was diverging from the English and I don't trust google - translate to put text that isn't insulting. -- And they renamed nagioscore-release to nagioscore-nagios. Ping/Pong -- Need to look at redoing pngs and such - -* Fri Feb 10 2017 Stephen Smoogen - 4.2.4-4 -- We find out that RHEL-6 does not like non-UTF so removed German translation - -* Thu Feb 9 2017 Stephen Smoogen - 4.2.4-3 -- Figure out that a mkdir only worked by accident on previous package. Move out of ifdef - -* Tue Feb 07 2017 Stephen Smoogen - 4.2.4-2 -- Pulled in version from COPR -- Remove lines which fedpkg lint did not like - -* Thu Dec 08 2016 Justin Paulsen - 4.2.4-1 -- Bumped to version 4.2.4 -- Fixed patches to match current version - -* Mon Nov 7 2016 Stephen Smoogen - 4.2.2-1 -- Bumped to version 4.2.2 -- Fixed patches to match current version - -* Fri Aug 12 2016 Kevin Fenzi - 4.0.8-4 -- Correct using sysvinit file instead of systemd unit - -* Mon May 16 2016 Jitka Plesnikova - 4.0.8-3 -- Perl 5.24 rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 4.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 29 2015 Scott Wilkerson - 4.0.8-2 -- Fixed missing PID #1291555 -- Fixed selinux permissions #1291734, #1291718 - -* Sat Sep 19 2015 Scott Wilkerson - 4.0.8-1 -- update to 4.0.8 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 06 2015 Jitka Plesnikova - 3.5.1-8 -- Perl 5.22 rebuild - -* Thu Aug 28 2014 Jitka Plesnikova - 3.5.1-7 -- Perl 5.20 rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 3.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Oct 25 2013 Peter Lemenkov - 3.5.1-4 -- Fixed main binary permissions - -* Mon Oct 21 2013 Peter Lemenkov - 3.5.1-3 -- Fixed typo in *.service file - -* Fri Oct 18 2013 Peter Lemenkov - 3.5.1-2 -- Drop EL5 support -- Added systemd support (rhbz #913550, also obsoletes rhbz #246990) -- Replace config.sub and config.guess instead of patching them - -* Fri Aug 30 2013 Jose Pedro Oliveira - 3.5.1-1 -- update to 3.5.1 -- drop patch nagios-3.4.3-spaces-to-plus-signs.patch (upstream bug #407) - -* Thu Aug 29 2013 Jose Pedro Oliveira - 3.5.0-9 -- init script overwrites pid file unnecessarily (#983129) -- corrected bogus dates - -* Sat Aug 03 2013 Fedora Release Engineering - 3.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Petr Pisar - 3.5.0-7 -- Perl 5.18 rebuild - -* Fri Jul 19 2013 Keiran Smith - 3.5.0-6 -- implimemt aarch64 patch from bug #926192 - -* Sat Jun 15 2013 Jose Pedro Oliveira - 3.5.0-5 -- Build package with PIE flags (#965529) -- Insecure temporary file usage in nagios.upgrade_to_v3.sh (#958292) - -* Tue Jun 11 2013 Remi Collet - 3.5.0-4 -- rebuild for new GD 2.1.0 - -* Wed Apr 24 2013 Jose Pedro Oliveira - 3.5.0-3 -- Add cfg_dir=/etc/nagios/conf.d to the main nagios configuration file - (nagios-3.5.0-conf.d-configuration-directory.patch) (#907145#c5) -- Own the configuration directory /etc/nagios/conf.d (#907145#c5) -- Ship the internet.cfg configuration file as documentation (#907145#c5) - -* Sat Apr 20 2013 Jose Pedro Oliveira - 3.5.0-2 -- Patch nagios-3.4.3-spaces-to-plus-signs.patch (#952139) - (upstream http://tracker.nagios.org/view.php?id=407) - -* Sat Apr 20 2013 Jose Pedro Oliveira - 3.5.0-1 -- Update to 3.5.0 - -* Thu Feb 14 2013 Fedora Release Engineering - 3.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 3.4.4-2 -- rebuild due to "jpeg8-ABI" feature drop - -* Sun Jan 13 2013 Jose Pedro Oliveira - 3.4.4-1 -- Update to 3.4.4 -- CVE-2012-6096 (#893269) - -* Sun Jan 13 2013 Jose Pedro Oliveira - 3.4.3-5 -- Refactored the patch nagios-0010-Added-several-images-to-the-sample-config.patch - as patch cant create binary files (#875362). - The old patch10 was replaced by nagios-0010-Added-several-images-to-the-sample-config-revb.patch - and the PNG files included as sources 10, 11, and 12. - -* Fri Dec 21 2012 Adam Tkac - 3.4.3-4 -- rebuild against new libjpeg - -* Wed Dec 5 2012 Jose Pedro Oliveira - 3.4.3-3 -- Use the Apache 2.4 RequireAll authorization container - -* Tue Dec 4 2012 Jose Pedro Oliveira - 3.4.3-2 -- Apache 2.4 configuration fix for Fedora 18+ (#871438); - Patch nagios-3.4.3-httpd-2.4-and-2.2.patch - -* Tue Dec 4 2012 Jose Pedro Oliveira - 3.4.3-1 -- Upgrade to 3.4.3 - -* Sat Nov 10 2012 Jose Pedro Oliveira - 3.4.2-1 -- Upgrade to 3.4.2 - -* Fri Jul 20 2012 Fedora Release Engineering - 3.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 28 2012 Petr Pisar - 3.4.1-2 -- Perl 5.16 rebuild - -* Mon Jun 25 2012 Jose Pedro Oliveira - 3.4.1-1 -- Upgrade to 3.4.1 (#835047) -- Dropped nagios-0012-Fixed-html-rss-install-files.patch - -* Fri Jun 15 2012 Petr Pisar - 3.3.1-4 -- Perl 5.16 rebuild - -* Fri Feb 10 2012 Jose Pedro Oliveira - 3.3.1-3 -- Move the nagios-commons usermod line to the main nagios package (#627527). - -* Fri Feb 10 2012 Jose Pedro Oliveira - 3.3.1-2 -- Add php to the requirements list (#519371, et al.). - -* Tue Feb 7 2012 Jose Pedro Oliveira - 3.3.1-1 -- Upgrade to 3.3.1 (#732329); - includes fixes for CVE-2011-1523 and CVE-2011-2179 (#690880, #690881, #709874). -- Make nagios-common own the /usr/lib{,64}/nagios/plugins directories (#756839). -- Change the ownership of /etc/nagios to the nagios-common package (#756839). -- Retab (tabs -> spaces). - -* Fri Jan 13 2012 Fedora Release Engineering - 3.2.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 3.2.3-12 -- Rebuild for new libpng - -* Tue Jun 21 2011 Marcela Maslanova - 3.2.3-11 -- Perl mass rebuild - -* Wed Mar 23 2011 Jan ONDREJ (SAL) - 3.2.3-10 -- Rebuild against new mysql. - -* Tue Feb 08 2011 Fedora Release Engineering - 3.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 25 2011 Peter Lemenkov - 3.2.3-8 -- Fixed strange permission on executables (see rhbz #672074) -- Dropped permissions on directories with log-files (see rhbz #672074) - -* Tue Nov 23 2010 Peter Lemenkov - 3.2.3-7 -- Finally fixed path to CGI (rhbz #653291) -- Added runtime dependency - mailx (see rhbz #655541) -- Added more images to the sample config - -* Thu Nov 18 2010 Peter Lemenkov - 3.2.3-6 -- Fixed path to passwd file in Apaches config file - -* Tue Nov 16 2010 Peter Lemenkov - 3.2.3-5 -- Fix building on EL-5 - -* Mon Nov 15 2010 Peter Lemenkov - 3.2.3-4 -- Fix path to CGI (rhbz #653291) - -* Wed Nov 3 2010 Peter Lemenkov - 3.2.3-3 -- Disable stripping of binaries (see rhbz #648223). - -* Wed Oct 27 2010 Peter Lemenkov - 3.2.3-2 -- Accidentally forgotten patches added back - -* Tue Oct 26 2010 Peter Lemenkov - 3.2.3-1 -- Ver. 3.2.3 -- Further cleanups in spec-file - -* Wed Sep 29 2010 jkeating - 3.2.2-2 -- Rebuilt for gcc bug 634757 - -* Sat Sep 11 2010 Peter Lemenkov - 3.2.2-1 -- Ver. 3.2.2 (rhbz #629439). -- Cleanup spec-file -- Ensure that %%{_sysconfdir}/httpd/conf.d/nagios.conf points to - the actual passwd file (see rhbz #576571). - -* Tue Aug 24 2010 Adam Tkac - 3.2.1-6 -- rebuild - -* Wed Jun 9 2010 Peter Lemenkov - 3.2.1-5 -- Removed obsoletes: nagios < 3.2.1-2 - -* Tue Jun 01 2010 Marcela Maslanova - 3.2.1-4 -- Mass rebuild with perl-5.12.0 - -* Mon May 17 2010 Peter Lemenkov - 3.2.1-3 -- Fixed severe issue with uninstalling main nagios package while - updating (see rhbz #590709 for details). - -* Sun Apr 25 2010 Peter Lemenkov - 3.2.1-2 -- Created 'common' subpackage for gid/uid and common directory - -* Sat Mar 13 2010 Peter Lemenkov - 3.2.1-1 -- Upgrade to 3.2.1 (#572587). -- Fixed SELinux patch (#573119). - -* Thu Feb 25 2010 Peter Lemenkov - 3.2.0-4 -- The package builds now with distro CFLAGS, CXXFLAGS (see bz #520979) -- Fixed returning status for init-script (see bz #546561) -- Fixed selinux issue with writing of PID-file (see bz #548638 and bz #539963) -- Fixed build on EPEL (see bz #526817) - -* Mon Dec 7 2009 Stepan Kasal - 3.2.0-3 -- rebuild against perl 5.10.1 - -* Mon Aug 17 2009 Mike McGrath - 3.2.0-2 -- s/datarootdir/datadir/ - -* Sun Aug 16 2009 Jose Pedro Oliveira - 3.2.0-1 -- Upgrade to 3.2.0 (#517210). - -* Fri Jul 24 2009 Jose Pedro Oliveira - 3.1.2-3 -- Corrected the package version in the last two changelog entries (#499853) -- Using configure --datarootdir option instead of --datadir (#499853) - (fixes the physical_html_path value in cgi.cfg) -- Fixes permissions to the new php configuration file config.inc.php (#499853) -- Re-enables the httpd requirement as its removal caused several problems - (see #487411 for more information) - -* Wed Jul 15 2009 Mike McGrath 3.1.2-2 -- Release bump for rebuild - -* Mon Jun 29 2009 Robert M. Albrecht 3.1.1-1 -- Upstream released a new version - -* Mon Jun 22 2009 Mike McGrath - 3.0.6-4 -- Removing httpd requires for #487411 - -* Wed Feb 25 2009 Fedora Release Engineering - 3.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 11 2009 Robert M. Albrecht 3.0.6-2 -- I messed my CVS up - -* Tue Dec 02 2008 Robert M. Albrecht 3.0.6-1 -- Upstream released a new version - -* Mon Nov 24 2008 Mike McGrath 3.0.5-1 -- Upstream released a new version - -* Mon Oct 20 2008 Robert M. Albrecht 3.0.4-3 -- Fixed a typo introduced in fixing Bugzilla 461087 - -* Mon Oct 20 2008 Robert M. Albrecht 3.0.4-2 -- Bugzilla 461087 wrong path for icons - -* Mon Oct 20 2008 Robert M. Albrecht 3.0.4-1 -- Upstream released 3.0.4 -- Fixed two typos in nagios.spec - -* Sun Sep 28 2008 Mike McGrath 3.0.3-9 -- License fix - -* Wed Jul 23 2008 Robert M. Albrecht 3.0.3-8 -- Matthew Jurgens provided a script and Readme for upgrading your config to Release 3 - -* Tue Jul 22 2008 Robert M. Albrecht 3.0.3-7 -- Added summary -- Added german translations - -* Thu Jul 10 2008 Robert M. Albrecht 3.0.3-6 -- disabled conf.d in nagios.conf for now - -* Thu Jul 10 2008 Robert M. Albrecht 3.0.3-5 -- Killed BuildRequirements for unsupported Fedora releases - -* Wed Jul 02 2008 Robert M. Albrecht 3.0.3-4 -- renamed preconfigured passwd to .htpasswd to enable Apaches .ht* protection -- added default .htpasswd with user nagiosadmin password nagiosadmin - -* Tue Jul 01 2008 Robert M. Albrecht 3.0.3-3 -- Added Apache style conf.d -- Added a working example config named internet.cfg -- The object folder was created twice - -* Tue Jul 01 2008 Robert M. Albrecht 3.0.3-2 -- Fixed folder /var/log/nagios/spool/checkresults -- silenced rpmlint (tabs, spaces) -- silenced rpmlint (configure missing libdir) - -* Sun Jun 29 2008 Robert M. Albrecht 3.0.3-1 -- Upstream released 3.0.3 - -* Sun Jun 22 2008 Robert M. Albrecht 3.0.2-1 -- Upstream released 3.0.2 - -* Mon May 26 2008 Shawn Starr 2.12-3 -- Fix spec seems to break for Fedora 10+ - -* Fri May 23 2008 Shawn Starr 2.12-2 -- Put back fix for Bugzilla #233887 - -* Fri May 23 2008 Shawn Starr 2.12-1 -- Upstream released 2.12 -- Fixes CVE-2007-5803 XSS issues, Bugzilla #445512 - -* Tue Mar 18 2008 Tom "spot" Callaway 2.11-3 -- add Requires for versioned perl (libperl.so) -- get rid of pointless file Requires - -* Mon Mar 17 2008 Mike McGrath 2.11-2 -- Upstream released new version -- Added perl-ExtUtils-Embed - -* Tue Feb 12 2008 Mike McGrath 2.10-6 -- Rebuild for gcc43 - -* Thu Nov 29 2007 Mike McGrath 2.10-5 -- Upstream released 2.10 -- Renamed cfg-sample configs to just .cfg -- Added BR of perl-devel, libjpeg-devel, libpng-devel - -* Wed Sep 26 2007 Mike McGrath 2.9-5 -- rebuild for koji test - -* Sat Sep 08 2007 Mike McGrath 2.9-4 -- rebuild - -* Wed Aug 22 2007 Mike McGrath 2.9-3 -- Rebuild for ppc32 and license - -* Tue Jul 10 2007 Mike McGrath 2.9-2 -- Release bump - -* Fri Jun 29 2007 Mike McGrath 2.9-1 -- Upstream released 2.9 - -* Tue Feb 06 2007 Mike McGrath 2.7-2 -- Upstream released 2.7 - -* Thu Nov 30 2006 Mike McGrath 2.6-1 -- Upstream released 2.6 - -* Thu Sep 07 2006 Mike McGrath 2.5-3 -- Release bump for mass rebuild - -* Wed Aug 02 2006 Mike McGrath 2.5-2 -- Fixed default permissions for private and the resource file - -* Fri Jul 14 2006 Mike McGrath 2.5-1 -- Upstream released 2.5 - -* Mon Jun 26 2006 Mike McGrath 2.4-2 -- Added /usr/bin/nagiostats bz# 194461 - -* Sun Jun 04 2006 Mike McGrath 2.4-1 -- Upstream released 2.4 -- Cleaned up changelog - -* Mon May 15 2006 Mike McGrath 2.3.1-1 -- Bug fix for HTTP content_length header integer overflow in CGIs -- Updates no longer remove Nagios from starting up on reboot - -* Tue May 09 2006 Mike McGrath 2.3-3 -- updates to the init script that prevented nagios from shutting down - -* Wed May 03 2006 Mike McGrath 2.3-1 -- Upstream released 2.3 -- Bug fix for negative HTTP content_length header in CGIs -- Added missing links for notes_url and action_url to service column of status detail page - -* Tue May 02 2006 Mike McGrath 2.2-3 -- Upstream released 2.2 - -* Tue Feb 21 2006 Mike McGrath 2.0-1 -- Upstream released 2.0 (changes below) -- Fix for segfault in timed event queue -- Removed length limitations for object vars/vals -- Updated config.sub and config.guess to versions from automake-1.9 -- Doc updates - -* Sat Feb 04 2006 Mike McGrath 2.0-0.2.rc2 -- Fixed default options in Apache config - -* Fri Jan 27 2006 Mike McGrath 2.0-0.1.rc2 -- Using 2.0rc2 tarball - -* Thu Jan 26 2006 Mike McGrath 1.3-15 -- Fixed usermod -a issue, Bugzilla #49609 - -* Sat Jan 15 2005 Mike McGrath 1.3-14 -- Fedora friendly spec file - -* Sat May 31 2003 Karl DeBisschop (1.1-1) -- Merge with CVS for 1.1 release - -* Fri May 30 2003 Karl DeBisschop (1.0-4) -- cmdgrp was not always getting created -- patches for cmd.cgi and history.cgi - -* Sat May 24 2003 Karl DeBisschop (1.0-3) -- patches for doco and PostgreSQL timestamp -- make sure all files are packaged (otherwise, will not build on RH9) - -* Sat May 17 2003 Karl DeBisschop (1.0-2) -- patch for file descriptor leak - -* Fri Oct 04 2002 Karl DeBisschop -- merge many improvements from Ramiro Morales - (macros for PERF_EXTERNAL and EMBPERL, cleanup pre/post scripts, - nnmmsg logger macro, include eventhandlers, convertcfg, mini_epn) -- use LSB-standard /etc/init.d/nagios startup location - -* Tue Aug 13 2002 Karl DeBisschop -- INSTALL was renamed INSTALLING -- p1.pl script included in package -- web server restarted because Red Hat 7.3 init does not do 'reload' - -* Fri Jun 14 2002 Ethan Galstad (1.0a4) -- Fixed spec file to work with Nagios - -* Wed Jan 17 2001 Karl DeBisschop (0.0.7a5-1) -- switch from /usr/libexec to /usr/lib because linux FHS has no libexec -- use global macro to set location of init script -- fold htaccess.sample into contrib directory of tarball - -* Fri Nov 03 2000 Karl DeBisschop (0.0.6-1) -- Rebuild with final sources - -* Wed Sep 06 2000 Karl DeBisschop (0.0.6b5-1) -- Create separate cgi, html, and devel packages -- Include commands.cfg - -* Sun Aug 27 2000 Karl DeBisschop (0.0.6b5-1) -- beta 5 - -* Sun Jul 23 2000 Karl DeBisschop (0.0.6b3-2) -- fixes for daemon-init, multi-OS RPM building - -* Wed Jul 12 2000 Karl DeBisschop (0.0.6b3-1) -- beta 3 - -* Sun Jun 25 2000 Karl DeBisschop (0.0.6b2-3) -- true beta2 sources - -* Sat Jun 24 2000 Karl DeBisschop (0.0.6b2-2) -- cleanup spec, still using pre-beta2 sources - -* Sat Jun 24 2000 Karl DeBisschop (0.0.6b2-1) -- mandrake merge using pre-beta2 sources (many thanks to Stefan van der Eijk ) - -* Wed Jun 14 2000 Karl DeBisschop (0.0.6b1-1) -- add stylesheet diffs - -* Mon Jun 12 2000 Karl DeBisschop (0.0.6b1-1) -- adapt for 0.0.6b1 - -* Mon Jun 05 2000 Karl DeBisschop (0.0.5-4) -- add traceroute.cgi and htaccess.sample -- move placement of docs (in files) to avoid group warnings -- change www user and group to nobody and add warning - -* Mon Jun 05 2000 Karsten Weiss (0.0.5-3) -- official group name -- improved user detection - -* Tue Oct 19 1999 Mike McHenry (0.0.4-1) -- Upgraded package from 0.0.4b4 to 0.0.4 - -* Mon Aug 16 1999 Mike McHenry -- First RPM build (0.0.4b4) - -# vim:set ai ts=4 sw=4 sts=4 et: diff --git a/nagios.tmpfiles.conf b/nagios.tmpfiles.conf deleted file mode 100644 index 907ca68..0000000 --- a/nagios.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/nagios 0755 nagios nagios - diff --git a/nagios.upgrade_to_v4.ReadMe b/nagios.upgrade_to_v4.ReadMe deleted file mode 100644 index 4f44871..0000000 --- a/nagios.upgrade_to_v4.ReadMe +++ /dev/null @@ -1,22 +0,0 @@ -Nagios v4 Upgrade Considerations -================================ - -This applies if you are upgrading from Nagios v2 or v3. - -The Nagios v2 or v3 nagios.cfg is will not pass a Nagios v4 syntax check without modification. Also note that Nagios Core v4 has more strict host/service definition requirements. -The following attributes from Nagios v2 or v3 are incompatible with Nagios v4 and will generate an error. - -use_embedded_perl_implicitly -sleep_time -p1_file -external_command_buffer_slots -enable_embedded_perl -command_check_interval - -In order to force a Nagios v2 or v3 nagios.cfg file to run with Nagios v4 simply commment out these nagios.cfg lines. - -The included script UpgradeToVersion4.sh will do this automatically for the file -/etc/nagios/nagios.cfg (the standard location for the nagios.cfg file) - -This is a work-around and you should consider implementing the new nagios.cfg file. - diff --git a/nagios.upgrade_to_v4.sh b/nagios.upgrade_to_v4.sh deleted file mode 100644 index d510f58..0000000 --- a/nagios.upgrade_to_v4.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# this script checks the nagios.cfg file and comments out several lines in accordance with the README. -# You will want to migrate to the Nagios v4 nagios.cfg file as soon as possible to take advantage of new features. - - -# this is the nagios.cfg file we will modify -nagios_cfg=/etc/nagios/nagios.cfg - -tmp1=`mktemp /tmp/nagios.cfg.XXXXXXXX` -cat $nagios_cfg > $tmp1 - -# search for and replace the check_result_buffer_slots attribute into a temporary file -sed -i --regexp-extended -e "s/^(\s*check_result_buffer_slots\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g" \ - -e 's/^(\s*use_embedded_perl_implicitly\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's/^(\s*sleep_time\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's/^(\s*p1_file\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's/^(\s*external_command_buffer_slots\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's/^(\s*enable_embedded_perl\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's/^(\s*command_check_interval\s*=\s*)/# Line Commented out for Nagios v4 Compatibility\n#\1/g' \ - -e 's|^(\s*#?query_socket\s*=\s*/var/log/nagios/rw/nagios.qh)|query_socket=/var/spool/nagios/cmd/nagios.qh|' $tmp1 - -# add query_socket if none exist -grep -q -F 'query_socket' $tmp1 || echo 'query_socket=/var/spool/nagios/cmd/nagios.qh' >> $tmp1 - -# check the diff -diff_output=`diff -u $nagios_cfg $tmp1` -diff_exit=$? - -# Decide whether or not to replace the file -if [ "$diff_exit" = "0" ]; then - echo "No changes were made to the Nagios Config file: $nagios_cfg" -elif [ "$diff_exit" = "1" ]; then - echo "The following changes were made to the Nagios Config file: $nagios_cfg" - echo "previous config has been saved to $nagios_cfg.oldrpm" - echo "$diff_output" - - # since changes were made, move the temp file into place - cp $nagios_cfg $nagios_cfg.oldrpm - cat $tmp1 > $nagios_cfg -else - echo "ERROR: Unexpected exit code from diff. No changes made to file: $nagios_cfg" -fi - -rm -f $tmp1 - diff --git a/nagios_epel.fc b/nagios_epel.fc deleted file mode 100644 index e69de29..0000000 diff --git a/nagios_epel6.te b/nagios_epel6.te deleted file mode 100644 index f7067c8..0000000 --- a/nagios_epel6.te +++ /dev/null @@ -1,39 +0,0 @@ -module nagios_epel 1.1; - -require { - type devlog_t; - type hostname_exec_t; - type kernel_t; - type ldconfig_exec_t; - type initrc_tmp_t; - type nagios_exec_t; - type httpd_nagios_script_t; - type nagios_services_plugin_t; - type nagios_spool_t; - type nagios_system_plugin_t; - type nagios_t; - class capability chown; - class file { execute execute_no_trans getattr open read }; - class sock_file { write create unlink }; - class unix_dgram_socket { connect create sendto }; - class unix_stream_socket connectto; -} - -#============= nagios_services_plugin_t ============== -allow nagios_services_plugin_t devlog_t:sock_file write; -allow nagios_services_plugin_t kernel_t:unix_dgram_socket sendto; -allow nagios_services_plugin_t self:unix_dgram_socket { connect create }; - -#============= nagios_t ============== -allow nagios_t hostname_exec_t:file { read getattr open execute execute_no_trans }; -allow nagios_t ldconfig_exec_t:file { execute execute_no_trans open read }; -allow nagios_t nagios_exec_t:file execute_no_trans; -allow nagios_t nagios_spool_t:sock_file { write create unlink }; -allow nagios_t self:capability chown; -allow nagios_t self:unix_stream_socket connectto; - -#============= httpd_nagios_script_t ============== -allow httpd_nagios_script_t nagios_spool_t:file { getattr open read }; - -#============= nagios_system_plugin_t ============== -allow nagios_system_plugin_t nagios_spool_t:file { getattr open read }; diff --git a/nagios_epel7.te b/nagios_epel7.te deleted file mode 100644 index a325233..0000000 --- a/nagios_epel7.te +++ /dev/null @@ -1,39 +0,0 @@ -module nagios_epel 1.1; - -require { - type devlog_t; - type hostname_exec_t; - type kernel_t; - type ldconfig_exec_t; - type initrc_tmp_t; - type nagios_exec_t; - type nagios_script_t; - type nagios_services_plugin_t; - type nagios_spool_t; - type nagios_system_plugin_t; - type nagios_t; - class capability chown; - class file { execute execute_no_trans getattr open read }; - class sock_file { write create unlink }; - class unix_dgram_socket { connect create sendto }; - class unix_stream_socket connectto; -} - -#============= nagios_services_plugin_t ============== -allow nagios_services_plugin_t devlog_t:sock_file write; -allow nagios_services_plugin_t kernel_t:unix_dgram_socket sendto; -allow nagios_services_plugin_t self:unix_dgram_socket { connect create }; - -#============= nagios_t ============== -allow nagios_t hostname_exec_t:file { read getattr open execute execute_no_trans }; -allow nagios_t ldconfig_exec_t:file { execute execute_no_trans open read }; -allow nagios_t nagios_exec_t:file execute_no_trans; -allow nagios_t nagios_spool_t:sock_file { write create unlink }; -allow nagios_t self:capability chown; -allow nagios_t self:unix_stream_socket connectto; - -#============= nagios_script_t ============== -allow nagios_script_t nagios_spool_t:file { getattr open read }; - -#============= nagios_system_plugin_t ============== -allow nagios_system_plugin_t nagios_spool_t:file { getattr open read }; diff --git a/printer.png b/printer.png deleted file mode 100644 index e00c62f..0000000 Binary files a/printer.png and /dev/null differ diff --git a/router.png b/router.png deleted file mode 100644 index c392744..0000000 Binary files a/router.png and /dev/null differ diff --git a/sources b/sources deleted file mode 100644 index ecf78f0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (nagioscore-nagios-4.4.3.tar.gz) = 40933521eb76952ec31fc082f040f0863e45c30e8b53a257f3c7bacc7940fd1717955f3bf91b70c847725f9658751af72189d52e7d82f605d90446c0decd0246 diff --git a/switch.png b/switch.png deleted file mode 100644 index 753bae9..0000000 Binary files a/switch.png and /dev/null differ