Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f84d64d330 | ||
|
|
540a2e5bbc | ||
|
|
3d4cba9d9f | ||
|
|
bc9d664d90 | ||
|
|
3b1ca2b697 | ||
|
|
51381091a3 | ||
|
|
73928bd1fa | ||
|
|
e1ca8bc374 | ||
|
0c7d8f6a21 | ||
|
|
25fa25f8b2 | ||
|
|
aeef0be6e7 | ||
|
|
44c74f14de | ||
|
|
55e7593df5 | ||
|
c3f6164688 | ||
|
|
c15c0c2287 |
8 changed files with 173 additions and 286 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -20,6 +20,4 @@ nagios-3.2.1.tar.gz
|
|||
/nagioscore-nagios-4.4.7.tar.gz
|
||||
/nagioscore-nagios-4.4.8.tar.gz
|
||||
/nagioscore-nagios-4.4.9.tar.gz
|
||||
/nagioscore-nagios-4.4.10.tar.gz
|
||||
/nagioscore-nagios-4.4.14.tar.gz
|
||||
/nagioscore-nagios-4.5.9.tar.gz
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ diff -up ./cgi/extinfo.c.remove_3rdparty_links ./cgi/extinfo.c
|
|||
diff -up ./cgi/status.c.remove_3rdparty_links ./cgi/status.c
|
||||
--- ./cgi/status.c.remove_3rdparty_links 2019-08-20 15:29:34.000000000 +0000
|
||||
+++ ./cgi/status.c 2019-08-29 18:17:32.322544264 +0000
|
||||
@@ -556,31 +556,8 @@ void document_header(int use_stylesheet)
|
||||
@@ -555,31 +555,8 @@ void document_header(int use_stylesheet)
|
||||
/* JS function to append content to elements on page */
|
||||
printf("<script type='text/javascript'>\n");
|
||||
if (enable_page_tour == TRUE) {
|
||||
|
|
@ -86,11 +86,10 @@ diff -up ./cgi/tac.c.remove_3rdparty_links ./cgi/tac.c
|
|||
|
||||
|
||||
|
||||
diff --git a/html/main.php b/html/main.php
|
||||
index 15713f8d..91cb1266 100644
|
||||
--- a/html/main.php
|
||||
+++ b/html/main.php
|
||||
@@ -23,21 +23,7 @@ if ($theme != 'dark' && $theme != 'light') {
|
||||
diff -up ./html/main.php.remove_3rdparty_links ./html/main.php
|
||||
--- ./html/main.php.remove_3rdparty_links 2019-08-20 15:29:34.000000000 +0000
|
||||
+++ ./html/main.php 2019-08-29 18:20:16.216716704 +0000
|
||||
@@ -19,20 +19,7 @@ $this_year = '2019';
|
||||
|
||||
<script type='text/javascript'>
|
||||
var cookie;
|
||||
|
|
@ -101,14 +100,67 @@ index 15713f8d..91cb1266 100644
|
|||
- "Click here to watch the entire Nagios Core 4 Tour!</a>";
|
||||
- <?php } ?>
|
||||
$(document).ready(function() {
|
||||
- var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER'] ?? ''); ?>";
|
||||
- var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
|
||||
-
|
||||
- <?php if ($cfg["enable_page_tour"]) { ?>
|
||||
- vBoxId += ";" + user;
|
||||
- vbox = new vidbox({pos:'lr',vidurl:'https://www.youtube.com/embed/2hVBAet-XpY',
|
||||
- text:vboxText,vidid:vBoxId});
|
||||
- <?php } ?>
|
||||
-
|
||||
getCoreStatus();
|
||||
});
|
||||
loadRemoteFeed( // Our top banner splash.
|
||||
'#splashbox0-contents', 'corebanner', 1,
|
||||
'', processBannerItem, ''
|
||||
@@ -59,7 +46,6 @@ $this_year = '2019';
|
||||
crossDomain: true,
|
||||
success: function(d, status, jqXHR) {
|
||||
// We should have Internet access, set the playlist HTML.
|
||||
- initializePlaylist();
|
||||
|
||||
var text = ''; // Start with empty text by default.
|
||||
|
||||
@@ -94,19 +80,6 @@ $this_year = '2019';
|
||||
: '';
|
||||
}
|
||||
|
||||
-
|
||||
- // Set our playlist HTML when we know we have Internet access.
|
||||
- var playlistInitialized = false;
|
||||
- function initializePlaylist() {
|
||||
- if (!playlistInitialized) {
|
||||
- playlistInitialized = true;
|
||||
- $('#splashbox3')
|
||||
- .addClass('splashbox3-full')
|
||||
- .removeClass('splashbox3-empty')
|
||||
- .html('<iframe width="100%" height="100%" src="//www.youtube.com/embed/videoseries?list=PLN-ryIrpC_mCUW1DFwZpxpAk00i60lSkE&iv_load_policy=3&rel=0" frameborder="0" allowfullscreen></iframe>');
|
||||
- }
|
||||
- }
|
||||
-
|
||||
// Get the daemon status JSON.
|
||||
function getCoreStatus() {
|
||||
setCoreStatusHTML('passiveonly', 'Checking process status...');
|
||||
diff -up ./html/map.php.remove_3rdparty_links ./html/map.php
|
||||
--- ./html/map.php.remove_3rdparty_links 2019-08-29 18:17:32.324544303 +0000
|
||||
+++ ./html/map.php 2019-08-29 18:20:48.488341376 +0000
|
||||
@@ -71,22 +71,6 @@
|
||||
<script type="text/javascript" src="js/jquery-1.12.4.min.js"></script>
|
||||
<script type="text/javascript" src="js/nag_funcs.js"></script>
|
||||
|
||||
- <?php if ($cfg["enable_page_tour"]) { ?>
|
||||
- <script type='text/javascript'>
|
||||
- var vbox;
|
||||
- var vBoxId = "map";
|
||||
- var vboxText = "<a href=https://www.nagios.com/tours target=_blank>" +
|
||||
- "Click here to watch the entire Nagios Core 4 Tour!</a>";
|
||||
- $(document).ready(function() {
|
||||
- var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
|
||||
-
|
||||
- vBoxId += ";" + user;
|
||||
- vbox = new vidbox({pos:'lr',vidurl:'https://www.youtube.com/embed/leaRdb3BElI',
|
||||
- text:vboxText,vidid:vBoxId});
|
||||
- });
|
||||
- </script>
|
||||
- <?php } ?>
|
||||
-
|
||||
</head>
|
||||
<body ng-controller="mapCtrl" <?php echo $img; ?>>
|
||||
<div id="image-cache" style="display: none;"></div>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/Changelog b/Changelog
|
||||
index a5fd04c6..51394645 100644
|
||||
--- a/Changelog
|
||||
+++ b/Changelog
|
||||
@@ -9,7 +9,7 @@ FIXES
|
||||
* Fixed duplicate properties appearing in statusjson.cgi (#718) (Sebastian Wolf)
|
||||
* Fixed NERD not building when enabled in ./configure (#723) (Sebastian Wolf)
|
||||
* Fixed build process when using GCC 10 (#721) (Michael Orlitzky)
|
||||
-* Fixed postauth vulnerabilities in histogram.js, map.js, trends.js (CVE-2020-1408) (Thanks UraSec Team) (Sebastian Wolf)
|
||||
+* Fixed postauth vulnerabilities in histogram.js, map.js, trends.js (CVE-2020-13977) (Thanks UraSec Team) (Sebastian Wolf)
|
||||
* When using systemd, configuration will be verified before reloading (#715) (tatref)
|
||||
* Fixed HARD OK states triggering on the maximum check attempt (#757) (Sebastian Wolf)
|
||||
|
||||
31
nagios.if
31
nagios.if
|
|
@ -334,34 +334,3 @@ interface(`nagios_unconfined_signull',`
|
|||
|
||||
allow $1 nagios_unconfined_plugin_t:process signull;
|
||||
')
|
||||
|
||||
########################################
|
||||
#
|
||||
# Nagios interface compatibility blocks
|
||||
#
|
||||
# The following definitions ensure compatibility with distribution policy
|
||||
# versions that do not contain given interfaces (epel, or older Fedora
|
||||
# releases).
|
||||
# Each block tests for existence of given interface and defines it if needed.
|
||||
#
|
||||
|
||||
########################################
|
||||
## <summary>
|
||||
## Allow caller to signull sssd.
|
||||
## Backport from RHEL8
|
||||
## </summary>
|
||||
## <param name="domain">
|
||||
## <summary>
|
||||
## Domain allowed access.
|
||||
## </summary>
|
||||
## </param>
|
||||
#
|
||||
ifndef(`sssd_signull',`
|
||||
interface(`sssd_signull',`
|
||||
gen_require(`
|
||||
type sssd_t;
|
||||
')
|
||||
|
||||
allow $1 sssd_t:process signull;
|
||||
')
|
||||
')
|
||||
|
|
|
|||
272
nagios.spec
272
nagios.spec
|
|
@ -1,17 +1,14 @@
|
|||
# Set %%bcond_without bootstrap to build without depending on plugins for localhost monitoring
|
||||
%bcond_with bootstrap
|
||||
|
||||
%global with_selinux 1
|
||||
%global selinuxtype targeted
|
||||
%global _hardened_build 1
|
||||
# Set bootstrap = 1 to build without depending on plugins for localhost monitoring
|
||||
%global bootstrap 0
|
||||
|
||||
Name: nagios
|
||||
Version: 4.5.9
|
||||
Release: 2%{?dist}
|
||||
Version: 4.4.14
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: Host/service/network monitoring program
|
||||
|
||||
# Automatically converted from old format: GPLv2 - review is highly recommended.
|
||||
License: GPL-2.0-only
|
||||
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
|
||||
|
|
@ -26,9 +23,9 @@ Source10: printer.png
|
|||
Source11: router.png
|
||||
Source12: switch.png
|
||||
Source13: nagios.README.SELinux.rst
|
||||
Source14: nagios.te
|
||||
Source15: nagios.fc
|
||||
Source16: nagios.if
|
||||
Source14: nagios_epel7.te
|
||||
Source15: nagios_epel.fc
|
||||
Source16: nagios_epel6.te
|
||||
|
||||
Patch1: nagios-0001-default-init.patch
|
||||
# Sent upstream
|
||||
|
|
@ -73,15 +70,21 @@ BuildRequires: libtool
|
|||
# For selinux tools
|
||||
BuildRequires: checkpolicy, selinux-policy-devel
|
||||
|
||||
%if 0%{?rhel} > 6 || 0%{?fedora} > 20
|
||||
# For necessary macros
|
||||
BuildRequires: systemd
|
||||
%endif
|
||||
|
||||
Requires: httpd
|
||||
Requires: php
|
||||
Requires: %{_bindir}/mail
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
Requires: mailx
|
||||
Requires: nagios-common
|
||||
Requires: user(nagios)
|
||||
Requires: group(nagios)
|
||||
|
||||
# This plugins are required for localhost monitoring
|
||||
%if %{without bootstrap}
|
||||
%if ! 0%{?bootstrap}
|
||||
Requires: nagios-plugins-ping
|
||||
Requires: nagios-plugins-load
|
||||
Requires: nagios-plugins-users
|
||||
|
|
@ -92,12 +95,6 @@ Requires: nagios-plugins-swap
|
|||
Requires: nagios-plugins-procs
|
||||
%endif
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
# This ensures that the *-selinux package and all it’s dependencies are not pulled
|
||||
# into containers and other systems that do not use SELinux
|
||||
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
|
||||
%endif
|
||||
|
||||
Requires(pre): group(nagios)
|
||||
Requires(pre): user(nagios)
|
||||
%if 0%{?rhel} > 6 || 0%{?fedora} > 20
|
||||
|
|
@ -126,6 +123,7 @@ 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)
|
||||
|
|
@ -151,18 +149,16 @@ that you specify.
|
|||
This package provides include files that Nagios-related applications
|
||||
may compile against.
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
# SELinux subpackage
|
||||
%if 0%{?rhel} > 5
|
||||
%package selinux
|
||||
Summary: SELinux context for %{name}
|
||||
BuildArch: noarch
|
||||
Requires: selinux-policy-%{selinuxtype}
|
||||
Requires(post): selinux-policy-%{selinuxtype}
|
||||
BuildRequires: checkpolicy, selinux-policy-devel
|
||||
%{?selinux_requires}
|
||||
Requires: %name = %version-%release
|
||||
Requires(post): policycoreutils
|
||||
Requires(postun): policycoreutils
|
||||
|
||||
|
||||
%description selinux
|
||||
SElinux security policy for %{name}.
|
||||
SElinux context for %{name}.
|
||||
%endif
|
||||
|
||||
%package contrib
|
||||
|
|
@ -172,23 +168,11 @@ Requires: %name = %version-%release
|
|||
%description contrib
|
||||
Various contributed items used by plugins and other tools.
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
# SELinux contexts are saved so that only affected files can be
|
||||
# relabeled after the policy module installation
|
||||
%pre selinux
|
||||
%selinux_relabel_pre -s %{selinuxtype}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n nagioscore-nagios-%{version}
|
||||
|
||||
install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
|
||||
|
||||
# Create a sysusers.d config file
|
||||
cat >nagios.sysusers.conf <<EOF
|
||||
u nagios - - %{_localstatedir}/spool/%{name} -
|
||||
EOF
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
|
@ -223,7 +207,6 @@ EOF
|
|||
--with-template-objects \
|
||||
--with-template-extinfo \
|
||||
--enable-event-broker \
|
||||
--disable-static \
|
||||
STRIP=/bin/true
|
||||
|
||||
%make_build all
|
||||
|
|
@ -241,16 +224,18 @@ cp -f %{SOURCE5} UpgradeToVersion4.ReadMe
|
|||
cp -f %{SOURCE6} UpgradeToVersion4.sh
|
||||
echo >> html/stylesheets/common.css
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
%if 0%{?rhel} > 5
|
||||
## SELinux configs
|
||||
mkdir selinux
|
||||
# Shipping the whole nagios policy (originally from selinux-policy-contrib)
|
||||
# this policy module will override the production module
|
||||
cp -p %{SOURCE14} selinux/
|
||||
cp -p %{SOURCE15} selinux/
|
||||
cp -p %{SOURCE16} selinux/
|
||||
|
||||
%make_build -f %{_datadir}/selinux/devel/Makefile %{name}.pp
|
||||
bzip2 -9 %{name}.pp
|
||||
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
|
||||
|
||||
|
||||
|
|
@ -259,9 +244,7 @@ bzip2 -9 %{name}.pp
|
|||
|
||||
# relocated to sbin (Fedora-specific)
|
||||
install -d -m 0755 %{buildroot}%{_bindir}
|
||||
%if 0%{?fedora} < 42 && 0%{?rhel} < 11
|
||||
mv %{buildroot}%{_sbindir}/nagiostats %{buildroot}%{_bindir}/nagiostats
|
||||
%endif
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/private
|
||||
mv %{buildroot}%{_sysconfdir}/%{name}/resource.cfg %{buildroot}%{_sysconfdir}/%{name}/private/resource.cfg
|
||||
|
|
@ -279,16 +262,16 @@ 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 0755 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
|
||||
install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
|
||||
install -d -m 0775 %{buildroot}%{_localstatedir}/spool/%{name}/cmd
|
||||
install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
|
||||
|
||||
# Make a run directory
|
||||
install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
|
||||
install -d -m 0775 %{buildroot}%{_localstatedir}/run/%{name}
|
||||
|
||||
# Make logdirs
|
||||
install -d -m 0755 %{buildroot}/%{_localstatedir}/log/
|
||||
install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/
|
||||
install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
|
||||
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%{?rhel} > 6 || 0%{?fedora} > 20
|
||||
|
|
@ -303,17 +286,15 @@ chmod -x %{buildroot}%{_unitdir}/%{name}.service
|
|||
%endif
|
||||
|
||||
# Fix permissions - FIXME remove this when unneeded
|
||||
chmod 755 %{buildroot}%{_sbindir}/nagios %{buildroot}%{_bindir}/nagiostats
|
||||
chmod 755 %{buildroot}%{_sbindir}/nagios
|
||||
|
||||
# Install documentation
|
||||
install -d -m 0755 %{buildroot}%{_datadir}/nagios/html/docs
|
||||
%{__cp} -r Documentation/html/* %{buildroot}%{_datadir}/nagios/html/docs
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
install -pm 0644 %{SOURCE13} README.SELinux.rst
|
||||
install -D -m 0644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
install -D -p -m 0644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
||||
%{__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
|
||||
|
|
@ -331,11 +312,10 @@ install -p -m 644 contrib/eventhandlers/redundancy-scenario1/handle-master-proc-
|
|||
|
||||
%{__mv} contrib/README contrib/README.contrib
|
||||
|
||||
# Fix permissions #2275532
|
||||
chmod -R g-w %{buildroot}%{_datadir}/%{name} %{buildroot}%{_libdir}/%{name} %{buildroot}%{_sysconfdir} %{buildroot}%{_sbindir}
|
||||
|
||||
install -m0644 -D nagios.sysusers.conf %{buildroot}%{_sysusersdir}/nagios.conf
|
||||
|
||||
%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
|
||||
|
|
@ -395,22 +375,49 @@ fi
|
|||
/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
|
||||
%endif
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
%if 0%{?rhel} >5
|
||||
%post selinux
|
||||
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
|
||||
%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
|
||||
|
||||
%postun selinux
|
||||
if [ $1 -eq 0 ]; then
|
||||
%selinux_modules_uninstall -s %{selinuxtype} %{name}
|
||||
%selinux_relabel_post -s %{selinuxtype}
|
||||
%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
|
||||
|
|
@ -423,11 +430,9 @@ fi
|
|||
%license LICENSE
|
||||
%{_datadir}/%{name}/html/[^cd]*
|
||||
%{_datadir}/%{name}/html/contexthelp/
|
||||
%{_datadir}/%{name}/html/d3/
|
||||
|
||||
%if 0%{?fedora} < 42 && 0%{?rhel} < 11
|
||||
%{_sbindir}/*
|
||||
%endif
|
||||
|
||||
%{_bindir}/*
|
||||
%{_libdir}/%{name}/cgi-bin/*cgi
|
||||
%if 0%{?rhel} > 6 || 0%{?fedora} > 20
|
||||
|
|
@ -446,11 +451,11 @@ fi
|
|||
%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(2755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
|
||||
%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(0750,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
|
||||
%attr(0770,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/checkresults
|
||||
|
||||
%files common
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
|
|
@ -458,101 +463,33 @@ fi
|
|||
%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}
|
||||
%{_sysusersdir}/nagios.conf
|
||||
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}
|
||||
%attr(0644,root,root) %{_libdir}/%{name}/libnagios.a
|
||||
|
||||
%if 0%{?with_selinux}
|
||||
%if 0%{?rhel} > 5
|
||||
%files selinux
|
||||
%doc README.SELinux.rst
|
||||
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
|
||||
%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
||||
%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
||||
%{_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 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue May 13 2025 Guido Aulisi <guido.aulisi@inps.it> - 4.5.9-1
|
||||
- Update to 4.5.9
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.14-8
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 4.4.14-6
|
||||
- convert license to SPDX
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Apr 27 2024 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-4
|
||||
- Fix permissions (#2275532)
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Aug 16 2023 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-1
|
||||
* Sat Mar 09 2024 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.14-1
|
||||
- Update to 4.4.14
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Feb 13 2023 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.10-1
|
||||
- Update to 4.4.10
|
||||
- Fix nagiostats permissions #2169033
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Dec 10 2022 Florian Weimer <fweimer@redhat.com> - 4.4.9-2
|
||||
- Port configure script to C99
|
||||
|
||||
* Thu Nov 17 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.9-1
|
||||
* Sun Dec 25 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.9-1
|
||||
- Update to 4.4.9
|
||||
|
||||
* Sun Oct 23 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.8-1
|
||||
- Update to 4.4.8
|
||||
|
||||
* Sun Sep 25 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.7-1
|
||||
- Update to 4.4.7
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.6-9
|
||||
- Perl 5.36 rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Jan 04 2022 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.6-7
|
||||
- Require a generic mail program (#2036844)
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.6-5
|
||||
- Perl 5.34 rebuild
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.6-4
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
* Wed Mar 03 2021 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.6-4
|
||||
- Add missing require for nagios-plugins-ping
|
||||
- Fix run path
|
||||
|
||||
* Sat Feb 27 2021 Guido Aulisi <guido.aulisi@gmail.com> - 4.4.6-3
|
||||
- Require plugins needed for localhost monitoring (#1932297)
|
||||
|
|
@ -565,23 +502,8 @@ fi
|
|||
- Fix for CVE-2020-13977 #BZ1849087
|
||||
- Some spec cleanup
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.5-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.5-8
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Mon Mar 2 2020 Martin Jackson <mhjacks@swbell.net> - 4.4.5-7
|
||||
- Update nrpe_etc_t policy in previous PR
|
||||
|
||||
* Thu Feb 27 2020 Martin Jackson <mhjacks@swbell.net> - 4.4.5-5
|
||||
- Update selinux subpackage to fix BZ#1749156 - thanks for the patch vmojzis
|
||||
|
||||
* Wed Feb 26 2020 Vit Mojzis <vmojzis@redhat.com> - 4.4.5-4
|
||||
- Update nagios-selinux based on the DSP guidelines
|
||||
* Tue Apr 7 2020 Martin Jackson <mhjacks@swbell.net> - 4.4.5-7
|
||||
- Revert to Smooge's last good build
|
||||
|
||||
* Tue Feb 18 2020 Stephen Smoogen <smooge@fedoraproject.org> - 4.4.5-3
|
||||
- Add change to allow for problems found in mass rebuild and gcc10.
|
||||
|
|
|
|||
26
nagios.te
26
nagios.te
|
|
@ -94,7 +94,7 @@ files_pid_file(nrpe_var_run_t)
|
|||
|
||||
allow nagios_plugin_domain self:fifo_file rw_fifo_file_perms;
|
||||
|
||||
allow nrpe_t nagios_plugin_domain:process { sigkill signal };
|
||||
allow nrpe_t nagios_plugin_domain:process { signal sigkill };
|
||||
|
||||
allow nagios_t nagios_plugin_domain:process signal_perms;
|
||||
allow nagios_plugin_domain nagios_t:process signal_perms;
|
||||
|
|
@ -127,7 +127,7 @@ allow nagios_t nagios_plugin_domain:process signal_perms;
|
|||
allow nagios_t nagios_eventhandler_plugin_exec_t:dir list_dir_perms;
|
||||
|
||||
allow nagios_t nagios_etc_t:dir list_dir_perms;
|
||||
allow nagios_t nagios_etc_t:file { map read_file_perms };
|
||||
allow nagios_t nagios_etc_t:file { read_file_perms map };
|
||||
allow nagios_t nagios_etc_t:lnk_file read_lnk_file_perms;
|
||||
|
||||
#allow nagios_t nagios_log_t:dir setattr_dir_perms;
|
||||
|
|
@ -206,7 +206,7 @@ mta_kill_system_mail(nagios_t)
|
|||
systemd_exec_systemctl(nagios_t)
|
||||
|
||||
tunable_policy(`nagios_run_sudo',`
|
||||
allow nagios_t self:capability { chown setgid setuid sys_ptrace sys_resource };
|
||||
allow nagios_t self:capability { chown setuid setgid sys_resource sys_ptrace };
|
||||
allow nagios_t self:process { setrlimit setsched };
|
||||
|
||||
allow nagios_t self:key write;
|
||||
|
|
@ -316,15 +316,14 @@ optional_policy(`
|
|||
# Nrpe local policy
|
||||
#
|
||||
|
||||
allow nrpe_t self:capability { kill setgid setuid };
|
||||
dontaudit nrpe_t self:capability { sys_resource sys_tty_config };
|
||||
allow nrpe_t self:process { setpgid setrlimit setsched signal_perms };
|
||||
allow nrpe_t self:capability { setuid setgid kill };
|
||||
dontaudit nrpe_t self:capability { sys_tty_config sys_resource };
|
||||
allow nrpe_t self:process { setpgid signal_perms setsched setrlimit };
|
||||
allow nrpe_t self:fifo_file rw_fifo_file_perms;
|
||||
allow nrpe_t self:tcp_socket { accept listen };
|
||||
|
||||
allow nrpe_t nagios_plugin_domain:process { sigkill signal };
|
||||
allow nrpe_t nagios_plugin_domain:process { signal sigkill };
|
||||
|
||||
list_dirs_pattern(nrpe_t, nrpe_etc_t, nrpe_etc_t)
|
||||
read_files_pattern(nrpe_t, nagios_etc_t, nrpe_etc_t)
|
||||
|
||||
manage_files_pattern(nrpe_t, nrpe_var_run_t, nrpe_var_run_t)
|
||||
|
|
@ -372,7 +371,7 @@ logging_send_syslog_msg(nrpe_t)
|
|||
userdom_dontaudit_use_unpriv_user_fds(nrpe_t)
|
||||
|
||||
tunable_policy(`nagios_run_sudo',`
|
||||
allow nrpe_t self:capability { setgid setuid sys_ptrace sys_resource };
|
||||
allow nrpe_t self:capability { setuid setgid sys_resource sys_ptrace };
|
||||
allow nrpe_t self:process { setrlimit setsched };
|
||||
|
||||
allow nrpe_t self:key write;
|
||||
|
|
@ -390,6 +389,7 @@ tunable_policy(`nagios_run_sudo',`
|
|||
|
||||
systemd_write_inherited_logind_sessions_pipes(nrpe_t)
|
||||
systemd_dbus_chat_logind(nrpe_t)
|
||||
systemd_logind_read_state(nrpe_t)
|
||||
|
||||
logging_send_audit_msgs(nrpe_t)
|
||||
')
|
||||
|
|
@ -467,7 +467,7 @@ files_getattr_all_file_type_fs(nagios_admin_plugin_t)
|
|||
# Mail local policy
|
||||
#
|
||||
|
||||
allow nagios_mail_plugin_t self:capability { dac_read_search setgid setuid };
|
||||
allow nagios_mail_plugin_t self:capability { setuid setgid dac_read_search };
|
||||
allow nagios_mail_plugin_t self:netlink_route_socket r_netlink_socket_perms;
|
||||
allow nagios_mail_plugin_t self:tcp_socket create_stream_socket_perms;
|
||||
allow nagios_mail_plugin_t self:udp_socket create_socket_perms;
|
||||
|
|
@ -520,8 +520,8 @@ storage_raw_read_fixed_disk(nagios_checkdisk_plugin_t)
|
|||
# Services local policy
|
||||
#
|
||||
|
||||
allow nagios_services_plugin_t self:capability { net_bind_service net_raw setuid };
|
||||
allow nagios_services_plugin_t self:process { sigkill signal };
|
||||
allow nagios_services_plugin_t self:capability { setuid net_bind_service net_raw };
|
||||
allow nagios_services_plugin_t self:process { signal sigkill };
|
||||
allow nagios_services_plugin_t self:tcp_socket create_stream_socket_perms;
|
||||
allow nagios_services_plugin_t self:udp_socket create_socket_perms;
|
||||
allow nagios_services_plugin_t self:unix_dgram_socket create_socket_perms;
|
||||
|
|
@ -575,7 +575,7 @@ optional_policy(`
|
|||
#
|
||||
|
||||
allow nagios_system_plugin_t self:capability { dac_read_search };
|
||||
dontaudit nagios_system_plugin_t self:capability { setgid setuid };
|
||||
dontaudit nagios_system_plugin_t self:capability { setuid setgid };
|
||||
|
||||
allow nagios_system_plugin_t nrpe_exec_t:file read_file_perms;
|
||||
allow nagios_system_plugin_t nagios_exec_t:file read_file_perms;
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (nagioscore-nagios-4.5.9.tar.gz) = 90bd71f772b6686b32fbe5f543468938f0dfc9c5bade1d41c27d63b1971d5000d16d6ca843b3eccab5550daa1bc649f16e8d68890052149126601a060ac9230d
|
||||
SHA512 (nagioscore-nagios-4.4.14.tar.gz) = 6dfe19887f035f3a3f6774a0f1c515902608934a75b08835fe9a5163812657547c97a20f3df42b89a34cad949eb4b587853b4131718c30703490b11fbee0d0ee
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
- hosts: localhost
|
||||
|
||||
roles:
|
||||
- role: standard-test-beakerlib
|
||||
tags:
|
||||
- classic
|
||||
repositories:
|
||||
- repo: https://pagure.io/DSP_test.git
|
||||
dest: DSP_test
|
||||
version: master
|
||||
|
||||
tests:
|
||||
- DSP_test
|
||||
environment:
|
||||
# RPM package containing the policy module
|
||||
TEST_RPM: nagios-selinux
|
||||
# policy module name
|
||||
TEST_POLICY: nagios
|
||||
# policy sources will be extracted from corresponding .src.rpm
|
||||
# policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz")
|
||||
# or empty string if policy sources are not inside a tar archive
|
||||
POLICY_TAR: ''
|
||||
# path to policy sources (in of the tar archive) -- <POLICY_TAR>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
|
||||
# or path in the src.rpm if there is no tar archive -- <src.rpm>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
|
||||
# can contain wildcards (e.g. for versions etc.)
|
||||
POLICY_PATH: .
|
||||
# allow rules ignored by "Unsound/dangerous policy practices" test
|
||||
IGNORE_RULES: >-
|
||||
nagios_script_t:system_map_t:file
|
||||
nagios_script_t:boot_t:dir
|
||||
|
||||
required_packages:
|
||||
- policycoreutils
|
||||
- selinux-policy
|
||||
- selinux-policy-targeted
|
||||
- setools-console
|
||||
- libselinux-utils
|
||||
- rpm
|
||||
- tar
|
||||
- git
|
||||
- nagios-selinux
|
||||
Loading…
Add table
Add a link
Reference in a new issue