Date: Tue, 26 Feb 2019 14:47:55 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493968 - in head/net-mgmt/icinga2: . files Message-ID: <201902261447.x1QEltd8066477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Feb 26 14:47:55 2019 New Revision: 493968 URL: https://svnweb.freebsd.org/changeset/ports/493968 Log: net-mgmt/icinga2: - Update to Bugfix release 2.10.3 - Make Icinga user, group and webgroup configurable in rc.conf [1] Submitted by: Alexey Kuznetsov <alexey@kouznetsov.com> (via mail) MFH: 2019Q1 Deleted: head/net-mgmt/icinga2/files/patch-lib_base_tcpsocket.cpp Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/distinfo head/net-mgmt/icinga2/files/icinga2.in head/net-mgmt/icinga2/pkg-plist Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Tue Feb 26 13:53:25 2019 (r493967) +++ head/net-mgmt/icinga2/Makefile Tue Feb 26 14:47:55 2019 (r493968) @@ -2,8 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.10.2 -PORTREVISION= 3 +DISTVERSION= 2.10.3 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org Modified: head/net-mgmt/icinga2/distinfo ============================================================================== --- head/net-mgmt/icinga2/distinfo Tue Feb 26 13:53:25 2019 (r493967) +++ head/net-mgmt/icinga2/distinfo Tue Feb 26 14:47:55 2019 (r493968) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542285281 -SHA256 (icinga-icinga2-v2.10.2_GH0.tar.gz) = 99ab0c511a8a7014b9cf9467fe126d4a369026e9353f6e64c05ae39a15b32ad9 -SIZE (icinga-icinga2-v2.10.2_GH0.tar.gz) = 4408535 +TIMESTAMP = 1551186744 +SHA256 (icinga-icinga2-v2.10.3_GH0.tar.gz) = 81d250ca7e609097dc78cb7fea646bdede5ecb4fd435b37d21f8ba3335fb7fd4 +SIZE (icinga-icinga2-v2.10.3_GH0.tar.gz) = 4421984 Modified: head/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- head/net-mgmt/icinga2/files/icinga2.in Tue Feb 26 13:53:25 2019 (r493967) +++ head/net-mgmt/icinga2/files/icinga2.in Tue Feb 26 14:47:55 2019 (r493968) @@ -32,12 +32,14 @@ load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} : ${icinga2_mkvar:="NO"} +: ${icinga2_user:="%%ICINGA2USER%%"} +: ${icinga2_group:="%%ICINGA2GROUP%%"} +: ${icinga2_webgroup:="www"} + command="%%PREFIX%%/sbin/${name}" procname="/usr/local/lib/icinga2/sbin/icinga2" extra_commands="reload checkconfig configtest" -icinga2_user="%%ICINGA2USER%%" -icinga2_group="%%ICINGA2GROUP%%" icinga2_cachedir="/var/cache/${name}" icinga2_libdir="/var/lib/${name}" @@ -98,14 +100,16 @@ start_precmd() { fi done - install -d -o ${icinga2_user} -g www "${icinga2_rundir}/cmd" + install -d -o ${icinga2_user} -g ${icinga2_webgroup} "${icinga2_rundir}/cmd" + fi chown -R ${icinga2_user}:${icinga2_group} "${icinga2_libdir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_spooldir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_cachedir}" - chown -R ${icinga2_user}:www "${icinga2_rundir}/cmd" + chown -R ${icinga2_user}:${icinga2_webgroup} "${icinga2_rundir}/cmd" + if ! icinga2_checkconfig; then return 1 Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Tue Feb 26 13:53:25 2019 (r493967) +++ head/net-mgmt/icinga2/pkg-plist Tue Feb 26 14:47:55 2019 (r493968) @@ -37,9 +37,9 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.2 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.3 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.2 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.3 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902261447.x1QEltd8066477>