From owner-svn-ports-all@freebsd.org Sat Sep 12 19:27:52 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E9B063E107C; Sat, 12 Sep 2020 19:27:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BpjMD5w7Kz4R8L; Sat, 12 Sep 2020 19:27:52 +0000 (UTC) (envelope-from swills@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 AE4301A20A; Sat, 12 Sep 2020 19:27:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08CJRq77081891; Sat, 12 Sep 2020 19:27:52 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08CJRqN4081889; Sat, 12 Sep 2020 19:27:52 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202009121927.08CJRqN4081889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 12 Sep 2020 19:27:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548415 - in head/www/beehive: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/beehive: . files X-SVN-Commit-Revision: 548415 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2020 19:27:53 -0000 Author: swills Date: Sat Sep 12 19:27:52 2020 New Revision: 548415 URL: https://svnweb.freebsd.org/changeset/ports/548415 Log: www/beehive: cleanup rc script and pkg-plist PR: 249279 Submitted by: Lewis Cook (maintainer) Deleted: head/www/beehive/pkg-plist Modified: head/www/beehive/Makefile (contents, props changed) head/www/beehive/files/beehive.in Modified: head/www/beehive/Makefile ============================================================================== --- head/www/beehive/Makefile Sat Sep 12 19:25:23 2020 (r548414) +++ head/www/beehive/Makefile Sat Sep 12 19:27:52 2020 (r548415) @@ -3,6 +3,7 @@ PORTNAME= beehive DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= vulcan@wired.sh @@ -145,6 +146,7 @@ _BEEHIVE_USER= ${PORTNAME} USERS= ${_BEEHIVE_USER} GROUPS= ${_BEEHIVE_USER} +PLIST_FILES= bin/${PORTNAME} PORTDOCS= README.md OPTIONS_DEFINE= DOCS @@ -156,9 +158,6 @@ post-extract: pre-build: (cd ${WRKSRC} && \ ${LOCALBASE}/bin/go-bindata ${_BUILD_TAGS} --pkg api -o api/bindata.go --ignore config/.git assets/... config/...) - -post-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/www/beehive/files/beehive.in ============================================================================== --- head/www/beehive/files/beehive.in Sat Sep 12 19:25:23 2020 (r548414) +++ head/www/beehive/files/beehive.in Sat Sep 12 19:27:52 2020 (r548415) @@ -31,46 +31,22 @@ load_rc_config $name : ${beehive_user:="%%USERS%%"} : ${beehive_group:="%%GROUPS%%"} -pidfile="/var/run/${name}.pid" +pidfiledir="/var/run/${name}" +pidfile="${pidfiledir}/${name}.pid" procname="%%PREFIX%%/bin/${name}" command="/usr/sbin/daemon" command_args="-f -p ${pidfile} ${procname} -bind ${beehive_bind} -canonicalurl ${beehive_url} -config ${beehive_config}" -start_precmd="${name}_pre" -stop_cmd="${name}_stop" -stop_postcmd="${name}_poststop" +start_precmd="${name}_prestart" -beehive_pre() +beehive_prestart() { - /usr/bin/install -o ${beehive_user} -g ${beehive_group} -m 755 -- /dev/null ${pidfile} - + if [ ! -d ${pidfiledir} ]; then + install -d -o ${beehive_user} -g ${beehive_group} ${pidfiledir} + fi if [ ! -d %%ETCDIR%% ]; then - /bin/mkdir -p %%ETCDIR%% + install -d -o ${beehive_user} -g ${beehive_group} %%ETCDIR%% fi - - /usr/sbin/chown ${beehive_user}:${beehive_group} %%ETCDIR%% - /bin/chmod 0700 %%ETCDIR%% - - if [ -f ${beehive_config} ]; then - /usr/sbin/chown ${beehive_user}:${beehive_group} ${beehive_config} - /bin/chmod 0600 ${beehive_config} - fi -} - -beehive_stop() -{ - if [ -f ${pidfile} ]; then - echo "Stopping ${name}." - kill -INT `cat ${pidfile}` 2>/dev/null - else - echo "${name} is not running." - return 1 - fi -} - -beehive_poststop() -{ - rm -f ${pidfile} } run_rc_command "$1"