From 1edd4f11bf73ecc96bc55eb709e3a1982125a330 Mon Sep 17 00:00:00 2001 From: Dave Eddy Date: Fri, 26 Jun 2020 16:12:12 -0400 Subject: [PATCH 1/3] New package: nagios-4.4.6 --- srcpkgs/nagios/files/nagios/run | 3 ++ srcpkgs/nagios/template | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 srcpkgs/nagios/files/nagios/run create mode 100644 srcpkgs/nagios/template diff --git a/srcpkgs/nagios/files/nagios/run b/srcpkgs/nagios/files/nagios/run new file mode 100644 index 00000000000..9ac567a9028 --- /dev/null +++ b/srcpkgs/nagios/files/nagios/run @@ -0,0 +1,3 @@ +#!/bin/sh +chown -R _nagios:_nagios /var/nagios +exec nagios /etc/nagios/nagios.cfg 2>&1 diff --git a/srcpkgs/nagios/template b/srcpkgs/nagios/template new file mode 100644 index 00000000000..d63cef9bb23 --- /dev/null +++ b/srcpkgs/nagios/template @@ -0,0 +1,64 @@ +# Template file for 'nagios' +pkgname=nagios +version=4.4.6 +revision=1 +build_style=gnu-configure + +_nagios_user="_nagios" +_nagios_group="_nagios" +_instdir="/usr/share/nagios" +_bindir="/usr/bin" +_vardir="/var/nagios" +_confdir="/etc/nagios" +_httpdconfdir="/etc/webapps/$pkgname/" +_checkresultdir="/var/nagios/spool/checkresults" +_cgibindir="/usr/libexec/nagios/cgi" + +configure_args=" + --with-nagios-user=$_nagios_user + --with-nagios-group=$_nagios_group + --prefix=$_instdir + --bindir=$_bindir + --localstatedir=$_vardir + --sysconfdir=$_confdir + --with-httpd-conf=$_httpdconfdir + --with-checkresultdir=$_checkresultdir + --with-cgibindir=$_cgibindir + --enable-embedded-perl" +make_build_args="all" +make_install_args=" + prefix=$_instdir + BINDIR=$_bindir + LOGDIR=$_vardir + CFGDIR=$_confdir + HTTPD_CONF=$_httpdconfdir + CHECKRESULTDIR=$_checkresultdir + CGIDIR=$_cgibindir + install install-config" + +makedepends="perl unzip" +make_dirs="/etc/nagios 0775 _nagios _nagios" +conf_files="/etc/nagios/nagios.cfg" + +short_desc="Nagios Core" +maintainer="Dave Eddy " +license="GPL-2.0-or-later" + +homepage="https://github.com/NagiosEnterprises/nagioscore" +changelog="${homepage}/blob/master/Changelog" +distfiles="${homepage}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" + +checksum=ab0d5a52caf01e6f4dcd84252c4eb5df5a24f90bb7f951f03875eef54f5ab0f4 +system_accounts="${_nagios_user}" + +post_install() { + # these dirs are wiped away by the void post install hooks since they are empty + vmkdir "$_vardir/rw" + vmkdir "$_vardir/spool/check/results" + + # nagios has these set as 770 by default + chmod 755 "$DESTDIR/$_bindir/nagios" + chmod 755 "$DESTDIR/$_bindir/nagiostats" + + vsv nagios +} From 6529f6464ede402bf633c6e307225f77e82e0d31 Mon Sep 17 00:00:00 2001 From: Dave Eddy Date: Mon, 29 Jun 2020 13:53:40 -0400 Subject: [PATCH 2/3] updates based on review --- srcpkgs/nagios/files/nagios/run | 1 - srcpkgs/nagios/template | 49 ++++++++++++++------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/srcpkgs/nagios/files/nagios/run b/srcpkgs/nagios/files/nagios/run index 9ac567a9028..4d0c73dfaf0 100644 --- a/srcpkgs/nagios/files/nagios/run +++ b/srcpkgs/nagios/files/nagios/run @@ -1,3 +1,2 @@ #!/bin/sh -chown -R _nagios:_nagios /var/nagios exec nagios /etc/nagios/nagios.cfg 2>&1 diff --git a/srcpkgs/nagios/template b/srcpkgs/nagios/template index d63cef9bb23..62be55d1578 100644 --- a/srcpkgs/nagios/template +++ b/srcpkgs/nagios/template @@ -10,37 +10,34 @@ _instdir="/usr/share/nagios" _bindir="/usr/bin" _vardir="/var/nagios" _confdir="/etc/nagios" -_httpdconfdir="/etc/webapps/$pkgname/" +_httpdconfdir="/etc/webapps/nagios/" _checkresultdir="/var/nagios/spool/checkresults" _cgibindir="/usr/libexec/nagios/cgi" configure_args=" - --with-nagios-user=$_nagios_user - --with-nagios-group=$_nagios_group - --prefix=$_instdir - --bindir=$_bindir - --localstatedir=$_vardir - --sysconfdir=$_confdir - --with-httpd-conf=$_httpdconfdir - --with-checkresultdir=$_checkresultdir - --with-cgibindir=$_cgibindir - --enable-embedded-perl" + --with-nagios-user=$_nagios_user + --with-nagios-group=$_nagios_group + --prefix=$_instdir + --bindir=$_bindir + --localstatedir=$_vardir + --sysconfdir=$_confdir + --with-httpd-conf=$_httpdconfdir + --with-checkresultdir=$_checkresultdir + --with-cgibindir=$_cgibindir + --enable-embedded-perl" make_build_args="all" -make_install_args=" - prefix=$_instdir - BINDIR=$_bindir - LOGDIR=$_vardir - CFGDIR=$_confdir - HTTPD_CONF=$_httpdconfdir - CHECKRESULTDIR=$_checkresultdir - CGIDIR=$_cgibindir - install install-config" - -makedepends="perl unzip" -make_dirs="/etc/nagios 0775 _nagios _nagios" +make_install_args="install install-config" + +hostmakedepends="perl unzip" +make_dirs=" +$_confdir 0775 _nagios _nagios +$_vardir 0755 _nagios _nagios +$_vardir/rw 0755 _nagios _nagios +$_vardir/spool 0755 _nagios _nagios +$_vardir/spool/checkresults 0755 _nagios _nagios" conf_files="/etc/nagios/nagios.cfg" -short_desc="Nagios Core" +short_desc="Nagios Core monitoring and alerting engine" maintainer="Dave Eddy " license="GPL-2.0-or-later" @@ -52,10 +49,6 @@ checksum=ab0d5a52caf01e6f4dcd84252c4eb5df5a24f90bb7f951f03875eef54f5ab0f4 system_accounts="${_nagios_user}" post_install() { - # these dirs are wiped away by the void post install hooks since they are empty - vmkdir "$_vardir/rw" - vmkdir "$_vardir/spool/check/results" - # nagios has these set as 770 by default chmod 755 "$DESTDIR/$_bindir/nagios" chmod 755 "$DESTDIR/$_bindir/nagiostats" From 1fcb7bb49a539998318d401f79ca60a4f159eec5 Mon Sep 17 00:00:00 2001 From: Dave Eddy Date: Sat, 21 Nov 2020 20:01:50 -0500 Subject: [PATCH 3/3] round of changes --- srcpkgs/nagios/template | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/srcpkgs/nagios/template b/srcpkgs/nagios/template index 62be55d1578..9726fd19150 100644 --- a/srcpkgs/nagios/template +++ b/srcpkgs/nagios/template @@ -6,35 +6,31 @@ build_style=gnu-configure _nagios_user="_nagios" _nagios_group="_nagios" -_instdir="/usr/share/nagios" -_bindir="/usr/bin" _vardir="/var/nagios" _confdir="/etc/nagios" -_httpdconfdir="/etc/webapps/nagios/" +_webdir="/usr/share/nagios" _checkresultdir="/var/nagios/spool/checkresults" _cgibindir="/usr/libexec/nagios/cgi" configure_args=" --with-nagios-user=$_nagios_user --with-nagios-group=$_nagios_group - --prefix=$_instdir - --bindir=$_bindir --localstatedir=$_vardir --sysconfdir=$_confdir --with-httpd-conf=$_httpdconfdir --with-checkresultdir=$_checkresultdir --with-cgibindir=$_cgibindir + --with-webdir=$_webdir --enable-embedded-perl" make_build_args="all" make_install_args="install install-config" hostmakedepends="perl unzip" make_dirs=" -$_confdir 0775 _nagios _nagios -$_vardir 0755 _nagios _nagios -$_vardir/rw 0755 _nagios _nagios -$_vardir/spool 0755 _nagios _nagios -$_vardir/spool/checkresults 0755 _nagios _nagios" +$_vardir 0770 _nagios _nagios +$_vardir/rw 0770 _nagios _nagios +$_vardir/spool 0770 _nagios _nagios +$_vardir/spool/checkresults 0770 _nagios _nagios" conf_files="/etc/nagios/nagios.cfg" short_desc="Nagios Core monitoring and alerting engine" @@ -49,7 +45,9 @@ checksum=ab0d5a52caf01e6f4dcd84252c4eb5df5a24f90bb7f951f03875eef54f5ab0f4 system_accounts="${_nagios_user}" post_install() { - # nagios has these set as 770 by default + # nagios has these set as 770 by default (owner and group are both + # "root"). Leaving these as 770 and executing nagios as root results + # in an error. chmod 755 "$DESTDIR/$_bindir/nagios" chmod 755 "$DESTDIR/$_bindir/nagiostats"