From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH v3 7/8] rrdtool: add systemd unit for rrdcached
Date: Fri, 28 Apr 2017 15:37:02 +0200 [thread overview]
Message-ID: <20170428133702.3204-1-clemens.gruber@pqgruber.com> (raw)
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/rrdtool.in | 12 ++++++++++++
rules/rrdtool.make | 11 ++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/rules/rrdtool.in b/rules/rrdtool.in
index fa7e1de1c..fb91a8b84 100644
--- a/rules/rrdtool.in
+++ b/rules/rrdtool.in
@@ -34,6 +34,18 @@ config RRDTOOL_RRDCACHED
accumulates them and, if enough have been received or a defined
time has passed, writes the updates to the RRD file.
+if RRDTOOL_RRDCACHED
+
+config RRDTOOL_RRDCACHED_SYSTEMD_UNIT
+ bool
+ default y
+ depends on SYSTEMD
+ prompt "install rrdcached systemd unit"
+ help
+ Install and enable a systemd socket-activated service
+
+endif
+
config RRDTOOL_RRDCGI
bool
depends on RRDTOOL_RRD_GRAPH
diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 2c7453811..59e0f6b14 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -61,7 +61,8 @@ RRDTOOL_CONF_OPT := \
--disable-tcl \
--disable-python \
--without-libiconv-prefix \
- --without-libintl-prefix
+ --without-libintl-prefix \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
ifneq ($(call remove_quotes,$(PTXCONF_RRDTOOL_DEFAULT_FONT)),)
RRDTOOL_CONF_OPT += --with-rrd-default-font=$(PTXCONF_RRDTOOL_DEFAULT_FONT)
@@ -82,6 +83,14 @@ $(STATEDIR)/rrdtool.targetinstall:
ifdef PTXCONF_RRDTOOL_RRDCACHED
@$(call install_copy, rrdtool, 0, 0, 0755, -, /usr/bin/rrdcached)
+ifdef PTXCONF_RRDTOOL_RRDCACHED_SYSTEMD_UNIT
+ @$(call install_alternative, rrdtool, 0, 0, 0644, \
+ /usr/lib/systemd/system/rrdcached.service)
+ @$(call install_alternative, rrdtool, 0, 0, 0644, \
+ /usr/lib/systemd/system/rrdcached.socket)
+ @$(call install_link, rrdtool, ../rrdcached.socket, \
+ /usr/lib/systemd/system/sockets.target.wants/rrdcached.socket)
+endif
endif
ifdef PTXCONF_RRDTOOL_RRDCGI
@$(call install_copy, rrdtool, 0, 0, 0755, -, /usr/bin/rrdcgi)
--
2.12.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-04-28 13:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170428133702.3204-1-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox