1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
Index: rrdtool/etc/rrdcached.service.in
===================================================================
--- rrdtool.orig/etc/rrdcached.service.in
+++ rrdtool/etc/rrdcached.service.in
@@ -1,19 +1,15 @@
-#
# To customize, copy this file to /etc/systemd/system/
-# and edit there
-#
+# and edit there or use systemctl edit rrdcached.
[Unit]
Description=Data caching daemon for rrdtool
Documentation=man:rrdcached(1)
[Service]
+EnvironmentFile=-/etc/default/rrdcached
# If you enable socket-activable rrdcached.socket,
# command line socket declarations will be ignored
-ExecStart=@prefix@/bin/rrdcached -g
-#WorkingDirectory=
-#User=
-#Group=
+ExecStart=@prefix@/bin/rrdcached -g -B -b $BASE_PATH -j $JOURNAL_PATH
[Install]
WantedBy=multi-user.target
Index: rrdtool/etc/rrdcached-default-lsb.in
===================================================================
--- rrdtool.orig/etc/rrdcached-default-lsb.in
+++ rrdtool/etc/rrdcached-default-lsb.in
@@ -1,17 +1,5 @@
# /etc/default file for RRD cache daemon
-# Full path to daemon
-DAEMON=@prefix@/bin/rrdcached
-
-# Optional override flush interval, in seconds.
-#WRITE_TIMEOUT=300
-
-# Optional override maximum write delay, in seconds.
-#WRITE_JITTER=0
-
-# Optional override number of write_threads
-#WRITE_THREADS=4
-
# Where database files are placed. If left unset, the default /tmp will
# be used. NB: The daemon will reject a directory that has symlinks as
# components. NB: You may want to have -B in BASE_OPTS.
@@ -20,38 +8,3 @@ BASE_PATH=/var/lib/rrdcached/db
# Where journal files are placed. If left unset, journaling will
# be disabled.
JOURNAL_PATH=/var/lib/rrdcached/journal/
-
-# FHS standard placement for process ID file.
-PIDFILE=/var/run/rrdcached.pid
-
-# FHS standard placement for local control socket.
-SOCKFILE=/var/run/rrdcached.sock
-
-# Optional override group that should own/access the local control
-# socket
-#SOCKGROUP=root
-
-# Optional override access mode of local control socket.
-#SOCKMODE=0660
-
-# Optional unprivileged group to run under when daemon. If unset
-# retains invocation group privileges.
-#DAEMON_GROUP=_rrdcached
-
-# Optional unprivileged user to run under when daemon. If unset
-# retains invocation user privileges.
-#DAEMON_USER=_rrdcached
-
-# Network socket address requests. Use in conjunction with SOCKFILE to
-# also listen on INET domain sockets. The option is a lower-case ell
-# ASCII 108 = 0x6c, and should be repeated for each address. The
-# parameter is an optional IP address, followed by an optional port with
-# a colon separating it from the address. The empty string is
-# interpreted as "open sockets on the default port on all available
-# interfaces", but generally does not pass through init script functions
-# so use -L with no parameters for that configuration.
-#NETWORK_OPTIONS="-L"
-
-# Any other options not specifically supported by the script (-P, -f,
-# -F, -B).
-BASE_OPTIONS="-B"
|
