From owner-svn-ports-all@freebsd.org Mon Jul 20 19:15:13 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 375F1367AC8; Mon, 20 Jul 2020 19:15:13 +0000 (UTC) (envelope-from zeising@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 4B9WdY0m15z4SlB; Mon, 20 Jul 2020 19:15:13 +0000 (UTC) (envelope-from zeising@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 F26B211CC9; Mon, 20 Jul 2020 19:15:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06KJFCEQ097587; Mon, 20 Jul 2020 19:15:12 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06KJFCKb097586; Mon, 20 Jul 2020 19:15:12 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202007201915.06KJFCKb097586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 20 Jul 2020 19:15:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542669 - in head/databases/rrdtool: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/databases/rrdtool: . files X-SVN-Commit-Revision: 542669 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: Mon, 20 Jul 2020 19:15:13 -0000 Author: zeising Date: Mon Jul 20 19:15:12 2020 New Revision: 542669 URL: https://svnweb.freebsd.org/changeset/ports/542669 Log: databases/rrdtool: Don't hardcode in start script Upate the start script of the rrdtool component rrdcached to not hardcode things like group, socket and pid. These can now be overridden in /etc/rc.conf with rrdcached_group, rrdcached_address and rrdcached_pid, respectively. The defaults are still the same. PR: 246122 Submitted by: Dries Michiels MFH: 2020Q3 Modified: head/databases/rrdtool/Makefile head/databases/rrdtool/files/rrdcached.in Modified: head/databases/rrdtool/Makefile ============================================================================== --- head/databases/rrdtool/Makefile Mon Jul 20 19:12:38 2020 (r542668) +++ head/databases/rrdtool/Makefile Mon Jul 20 19:15:12 2020 (r542669) @@ -3,7 +3,7 @@ PORTNAME= rrdtool PORTVERSION= 1.7.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ Modified: head/databases/rrdtool/files/rrdcached.in ============================================================================== --- head/databases/rrdtool/files/rrdcached.in Mon Jul 20 19:12:38 2020 (r542668) +++ head/databases/rrdtool/files/rrdcached.in Mon Jul 20 19:15:12 2020 (r542669) @@ -10,9 +10,14 @@ # # rrdcached_enable (bool): Set to "NO" by default. # Set to "YES" to enable rrdcached -# -# rrdcached_flags (str): Set to "" by default. -# +# rrdcached_address (string): Socket or IP address to listen to +# Default: socket /var/run/rrdcached.sock +# rrdcached_group (string): Group owner of the socket +# Default: www +# rrdcached_pid (string): PID file location +# Default: /var/run/rrdcached.pid +# rrdcached_flags (string): Arguments appended to command_args +# Default: "" . /etc/rc.subr @@ -23,9 +28,12 @@ load_rc_config $name # Set defaults : ${rrdcached_enable="NO"} -: ${rrdcached_flags="-s www -l /var/run/rrdcached.sock -p /var/run/rrdcached.pid"} +: ${rrdcached_address="/var/run/rrdcached.sock"} +: ${rrdcached_group="www"} +: ${rrdcached_pid="/var/run/rrdcached.pid"} pidfile=/var/run/${name}.pid command=%%PREFIX%%/bin/${name} +command_args="-s $rrdcached_group -l $rrdcached_address -p $rrdcached_pid" run_rc_command "$1"