Date: Wed, 22 Jul 2020 16:24:29 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r542872 - in branches/2020Q3/databases/rrdtool: . files Message-ID: <202007221624.06MGOTPF088796@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Jul 22 16:24:28 2020 New Revision: 542872 URL: https://svnweb.freebsd.org/changeset/ports/542872 Log: MFH: r542669 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 Approved by: ports-secteam (joenum) Modified: branches/2020Q3/databases/rrdtool/Makefile branches/2020Q3/databases/rrdtool/files/rrdcached.in Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/databases/rrdtool/Makefile ============================================================================== --- branches/2020Q3/databases/rrdtool/Makefile Wed Jul 22 16:23:01 2020 (r542871) +++ branches/2020Q3/databases/rrdtool/Makefile Wed Jul 22 16:24:28 2020 (r542872) @@ -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: branches/2020Q3/databases/rrdtool/files/rrdcached.in ============================================================================== --- branches/2020Q3/databases/rrdtool/files/rrdcached.in Wed Jul 22 16:23:01 2020 (r542871) +++ branches/2020Q3/databases/rrdtool/files/rrdcached.in Wed Jul 22 16:24:28 2020 (r542872) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007221624.06MGOTPF088796>