svn commit: r458718 - branches/2018Q1/net-mgmt/icingaweb2

[Lars Engels]

Author: lme
Date: Thu Jan 11 09:13:58 2018
New Revision: 458718
URL: https://svnweb.freebsd.org/changeset/ports/458718

Log:
  MFH: r457968
  
  net-mgmt/icingaweb2:
  
  - Install icingacli to ${PREFIX}/bin and patch it to make it usable. Now you
    can configure Icinga Web 2 with it and can use the embedded PHP web server.
  - Bump PORTREVISION
  
  Approved by:	portmgr (swills)

Modified:
  branches/2018Q1/net-mgmt/icingaweb2/Makefile
  branches/2018Q1/net-mgmt/icingaweb2/pkg-plist
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/net-mgmt/icingaweb2/Makefile
==============================================================================
--- branches/2018Q1/net-mgmt/icingaweb2/Makefile	Thu Jan 11 09:00:51 2018	(r458717)
+++ branches/2018Q1/net-mgmt/icingaweb2/Makefile	Thu Jan 11 09:13:58 2018	(r458718)
@@ -3,6 +3,7 @@
 PORTNAME=	icingaweb2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 
 MAINTAINER=	lme at FreeBSD.org
@@ -42,6 +43,11 @@ MYSQL_USE=	PHP=pdo_mysql
 LDAP_USE=	PHP=ldap
 PDF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
 
+post-patch:
+	${REINPLACE_CMD} 's%\(/etc/icingaweb2\)%${PREFIX}\1%g' \
+		${WRKSRC}/library/Icinga/Application/ApplicationBootstrap.php
+	${REINPLACE_CMD} 's%readlink[^)]*)%"${PREFIX}/bin/php"%g' \
+		${WRKSRC}/application/clicommands/WebCommand.php
 do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d/
 	${INSTALL_DATA} ${WRKSRC}/etc/bash_completion.d/icingacli \
@@ -51,11 +57,16 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
-	${CHMOD} 755 ${STAGEDIR}/${WWWDIR}/bin/icingacli
+	${CHMOD} 755 ${STAGEDIR}${WWWDIR}/bin/icingacli
+	${RLN} ${STAGEDIR}${WWWDIR}/bin/icingacli ${STAGEDIR}${PREFIX}/bin/icingacli
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for webserver in apache nginx
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${webserver}
+	# ICINGAWEB_CONFIGDIR is set to /nonexistent to allow staging as user.
+	# Once installed, ${ETCDIR} is not world-readable, so point icingacli to
+	# a non existing directory. The config files are generated correctly anyway.
 	(cd ${STAGEDIR}${WWWDIR} && \
+	ICINGAWEB_CONFIGDIR=/nonexistent \
 	./bin/icingacli setup config webserver ${webserver} --path=/icingaweb2 \
 	--root=${WWWDIR}/public --config=${ETCDIR} \
 	--file=${STAGEDIR}${EXAMPLESDIR}/${webserver}/icingaweb2.conf)

Modified: branches/2018Q1/net-mgmt/icingaweb2/pkg-plist
==============================================================================
--- branches/2018Q1/net-mgmt/icingaweb2/pkg-plist	Thu Jan 11 09:00:51 2018	(r458717)
+++ branches/2018Q1/net-mgmt/icingaweb2/pkg-plist	Thu Jan 11 09:13:58 2018	(r458718)
@@ -1,3 +1,4 @@
+bin/icingacli
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/icingaweb2.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash_completion.d/icingacli
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx/icingaweb2.conf