From d0cabae5aa2a4220f68ca2b10ef7299c353b8081 Mon Sep 17 00:00:00 2001
From: Lars Engels <lme@FreeBSD.org>
Date: Fri, 12 Oct 2018 12:19:57 +0000
Subject: [PATCH] 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 <ohartmann@walstatt.org>
MFH:		2018Q4
---
 net-mgmt/icinga2/Makefile         |  1 +
 net-mgmt/icinga2/files/icinga2.in | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 1a48a497d6cf..84a7d2ffce4c 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
diff --git a/net-mgmt/icinga2/files/icinga2.in b/net-mgmt/icinga2/files/icinga2.in
index b2b6a3033fa5..8f89f2f6d2b8 100644
--- a/net-mgmt/icinga2/files/icinga2.in
+++ b/net-mgmt/icinga2/files/icinga2.in
@@ -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,17 +95,18 @@ 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
   fi