From owner-svn-ports-head@freebsd.org Wed Mar 14 19:20:30 2018 Return-Path: Delivered-To: svn-ports-head@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 5934DF3A554; Wed, 14 Mar 2018 19:20:30 +0000 (UTC) (envelope-from feld@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 0B4E8727A3; Wed, 14 Mar 2018 19:20:30 +0000 (UTC) (envelope-from feld@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 01FF73F80; Wed, 14 Mar 2018 19:20:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2EJKTVf023609; Wed, 14 Mar 2018 19:20:29 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2EJKTY8023607; Wed, 14 Mar 2018 19:20:29 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201803141920.w2EJKTY8023607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 14 Mar 2018 19:20:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464527 - in head/textproc/kibana6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/textproc/kibana6: . files X-SVN-Commit-Revision: 464527 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2018 19:20:30 -0000 Author: feld Date: Wed Mar 14 19:20:29 2018 New Revision: 464527 URL: https://svnweb.freebsd.org/changeset/ports/464527 Log: textproc/kibana6: Fix ability to install plugins - Also update rc script to better match behavior of the stock "kibana" script which starts up the process in environments where you are not using a traditional rc / init script. Modified: head/textproc/kibana6/Makefile head/textproc/kibana6/files/kibana.in Modified: head/textproc/kibana6/Makefile ============================================================================== --- head/textproc/kibana6/Makefile Wed Mar 14 19:17:59 2018 (r464526) +++ head/textproc/kibana6/Makefile Wed Mar 14 19:20:29 2018 (r464527) @@ -4,7 +4,7 @@ PORTNAME= kibana PORTVERSION= 6.2.2 DISTVERSIONSUFFIX= -linux-x86_64 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ @@ -26,15 +26,16 @@ USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-deinstall do-install: - ${CP} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${PREFIX}/etc/kibana.yml.sample - ${MKDIR} ${STAGEDIR}${WWWDIR} - cd ${WRKSRC} && \ - ${RM} -r bin config node && \ - ${RM} -r optimize && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample + (cd ${WRKSRC} && \ + ${RM} -r config node optimize && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) + ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config + ${CHMOD} +x ${STAGEDIR}${WWWDIR}/bin/* post-install: - ${ECHO} "@sample etc/kibana.yml.sample" >> ${TMPPLIST} + ${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} Modified: head/textproc/kibana6/files/kibana.in ============================================================================== --- head/textproc/kibana6/files/kibana.in Wed Mar 14 19:17:59 2018 (r464526) +++ head/textproc/kibana6/files/kibana.in Wed Mar 14 19:20:29 2018 (r464527) @@ -15,17 +15,20 @@ rcvar=kibana_enable load_rc_config $name : ${kibana_enable:="NO"} -: ${kibana_config:="%%PREFIX%%/etc/kibana.yml"} +: ${kibana_config:="%%ETCDIR%%/kibana.yml"} : ${kibana_user:="www"} : ${kibana_group:="www"} : ${kibana_log:="/var/log/kibana.log"} +export BABEL_DISABLE_CACHE=1 +export NODE_ENV=production + required_files="${kibana_config}" pidfile="/var/run/${name}/${name}.pid" start_precmd="kibana_precmd" procname="%%LOCALBASE%%/bin/node" command="/usr/sbin/daemon" -command_args="-f -p ${pidfile} env BABEL_DISABLE_CACHE=1 ${procname} %%WWWDIR%%/src/cli serve --config ${kibana_config} --log-file ${kibana_log}" +command_args="-f -p ${pidfile} ${procname} --no-warnings %%WWWDIR%%/src/cli serve --config ${kibana_config} --log-file ${kibana_log}" kibana_precmd() { @@ -39,6 +42,10 @@ kibana_precmd() if [ ! -d %%WWWDIR%%/optimize ]; then install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize + else + # We may have installed a plugin as root which will cause files in here + # to be owned by root:wheel. Fix with a chown. + chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize fi }