From owner-svn-ports-all@freebsd.org Tue Oct 16 11:37:56 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A13810CB869; Tue, 16 Oct 2018 11:37:56 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45948888DC; Tue, 16 Oct 2018 11:37:56 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 224161BFD6; Tue, 16 Oct 2018 11:37:56 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9GBbtjv047415; Tue, 16 Oct 2018 11:37:55 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9GBbtnW047412; Tue, 16 Oct 2018 11:37:55 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201810161137.w9GBbtnW047412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Tue, 16 Oct 2018 11:37:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482218 - in branches/2018Q4/net-mgmt/icinga2: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: lme X-SVN-Commit-Paths: in branches/2018Q4/net-mgmt/icinga2: . files X-SVN-Commit-Revision: 482218 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2018 11:37:56 -0000 Author: lme Date: Tue Oct 16 11:37:55 2018 New Revision: 482218 URL: https://svnweb.freebsd.org/changeset/ports/482218 Log: MFH: r481898 net-mgmt/icinga2: - Fix directory permissions after upgrading icinga2 via pkg - Whitespace fixes in icinga2.in - Bump PORTREVISION PR: 227965, 227107 Submitted by: O. Hartmann Approved by: ports-secteam (miwi) Modified: branches/2018Q4/net-mgmt/icinga2/Makefile branches/2018Q4/net-mgmt/icinga2/files/icinga2.in Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net-mgmt/icinga2/Makefile ============================================================================== --- branches/2018Q4/net-mgmt/icinga2/Makefile Tue Oct 16 10:30:43 2018 (r482217) +++ branches/2018Q4/net-mgmt/icinga2/Makefile Tue Oct 16 11:37:55 2018 (r482218) @@ -3,6 +3,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v DISTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org Modified: branches/2018Q4/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- branches/2018Q4/net-mgmt/icinga2/files/icinga2.in Tue Oct 16 10:30:43 2018 (r482217) +++ branches/2018Q4/net-mgmt/icinga2/files/icinga2.in Tue Oct 16 11:37:55 2018 (r482218) @@ -19,7 +19,7 @@ . /etc/rc.subr -# Add /usr/local/bin to path, so that the notification scripts +# Add /usr/local/bin to path, so that the notification scripts # can work (#!/usr/bin/env bash) export PATH=$PATH:%%LOCALBASE%%/bin:%%PREFIX%%/sbin @@ -86,7 +86,6 @@ reload_precmd() { start_precmd() { if checkyesno "icinga2_mkvar"; then # Create necessary directories / change ownership - # # While this is also done through pkg-plist, /var might be on a ramdisk, # so make sure all needed files and directories are created before starting # Icinga. @@ -96,16 +95,17 @@ start_precmd() { "${icinga2_rundir}" "${icinga2_cachedir}"; do if [ ! -d "${d}" ]; then install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" - else - chown ${icinga2_user}:${icinga2_group} "${d}" fi done - install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" + install -d -o ${icinga2_user} -g www "${icinga2_rundir}/cmd" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" 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" if ! icinga2_checkconfig; then return 1