diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-07-20 19:15:12 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-07-20 19:15:12 +0000 |
| commit | f04dbbe034ff67548ac0cb098e7f57fa5fb6f37f (patch) | |
| tree | c352d19b3bb01c28972f4a61340d970f8921004f /databases/rrdtool | |
| parent | d444a1556f6824cdc1011450e2ae3d5de2b9aabd (diff) | |
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
Notes
Notes:
svn path=/head/; revision=542669
Diffstat (limited to 'databases/rrdtool')
| -rw-r--r-- | databases/rrdtool/Makefile | 2 | ||||
| -rw-r--r-- | databases/rrdtool/files/rrdcached.in | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 6d8fefeefd6d..eafc6e68e8b0 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -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/ diff --git a/databases/rrdtool/files/rrdcached.in b/databases/rrdtool/files/rrdcached.in index bcd7eda42e8b..09f7e457202b 100644 --- a/databases/rrdtool/files/rrdcached.in +++ b/databases/rrdtool/files/rrdcached.in @@ -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" |