From owner-svn-ports-branches@freebsd.org Thu Jan 11 09:14:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15CC2E7965A; Thu, 11 Jan 2018 09:14:00 +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 E403131DE; Thu, 11 Jan 2018 09:13:59 +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 2CEA212E05; Thu, 11 Jan 2018 09:13:59 +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 w0B9Dw2v023891; Thu, 11 Jan 2018 09:13:58 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0B9DwQb023889; Thu, 11 Jan 2018 09:13:58 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201801110913.w0B9DwQb023889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Thu, 11 Jan 2018 09:13:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458718 - branches/2018Q1/net-mgmt/icingaweb2 X-SVN-Group: ports-branches X-SVN-Commit-Author: lme X-SVN-Commit-Paths: branches/2018Q1/net-mgmt/icingaweb2 X-SVN-Commit-Revision: 458718 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jan 2018 09:14:00 -0000 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@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