Date: Wed, 3 Jan 2018 15:02:39 +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: r457968 - head/net-mgmt/icingaweb2 Message-ID: <201801031502.w03F2dmR016476@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Wed Jan 3 15:02:39 2018 New Revision: 457968 URL: https://svnweb.freebsd.org/changeset/ports/457968 Log: 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 MFH: 2018Q1 Modified: head/net-mgmt/icingaweb2/Makefile head/net-mgmt/icingaweb2/pkg-plist Modified: head/net-mgmt/icingaweb2/Makefile ============================================================================== --- head/net-mgmt/icingaweb2/Makefile Wed Jan 3 15:01:15 2018 (r457967) +++ head/net-mgmt/icingaweb2/Makefile Wed Jan 3 15:02:39 2018 (r457968) @@ -3,6 +3,7 @@ PORTNAME= icingaweb2 DISTVERSIONPREFIX= v DISTVERSION= 2.5.0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MAINTAINER= lme@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: head/net-mgmt/icingaweb2/pkg-plist ============================================================================== --- head/net-mgmt/icingaweb2/pkg-plist Wed Jan 3 15:01:15 2018 (r457967) +++ head/net-mgmt/icingaweb2/pkg-plist Wed Jan 3 15:02:39 2018 (r457968) @@ -1,3 +1,4 @@ +bin/icingacli %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/icingaweb2.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash_completion.d/icingacli %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx/icingaweb2.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801031502.w03F2dmR016476>