ceph-exporter: fix systemd unit

change systemd unit into templated unit, that the %i which is used
inside the unit is working

Signed-off-by: Henry Hirsch <henry.hirsch@1und1.de>

diff --git a/ceph.spec.in b/ceph.spec.in
index d4cabb21cfb9100685c25f04d2d101b6b79f755c..f660f5b40b04f86165e9ea8cc04778a0379aadca 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -2154,7 +2154,7 @@ fi
 
 %files -n ceph-exporter
 %{_bindir}/ceph-exporter
-%{_unitdir}/ceph-exporter.service
+%{_unitdir}/ceph-exporter@.service
 
 %files -n rbd-fuse
 %{_bindir}/rbd-fuse

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 072730142bec08a4173ce7124ad94a49c144f8f1..d7ff272b396df026c52c760b7d5c2968ff98e108 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CEPH_SYSTEMD_ENV_DIR "/etc/sysconfig"
 set(SYSTEMD_ENV_FILE "${CEPH_SYSTEMD_ENV_DIR}/ceph")
 foreach(service
     ceph-crash
-    ceph-exporter
+    ceph-exporter@
     ceph-fuse@
     ceph-mds@
     ceph-mgr@

diff --git a/systemd/ceph-exporter.service.in b/systemd/ceph-exporter.service.in
deleted file mode 100644 (file)
index ce5b3b0..0000000
--- a/systemd/ceph-exporter.service.in
+++ /dev/null
@@ -1,29 +0,0 @@
-[Unit]
-Description=Ceph cluster exporter daemon
-PartOf=ceph.target
-After=network-online.target local-fs.target
-Before=ceph.target
-Wants=network-online.target local-fs.target ceph.target ceph-mon.target
-
-[Service]
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-exporter -f --id %i --setuser ceph --setgroup ceph
-LockPersonality=true
-NoNewPrivileges=true
-PrivateDevices=yes
-PrivateTmp=true
-ProtectControlGroups=true
-ProtectHome=true
-ProtectHostname=true
-ProtectKernelLogs=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectSystem=full
-Restart=on-failure
-RestartSec=10
-RestrictSUIDSGID=true
-StartLimitBurst=3
-StartLimitInterval=30min
-
-[Install]
-WantedBy=multi-user.target ceph.target

diff --git a/systemd/ceph-exporter@.service.in b/systemd/ceph-exporter@.service.in
new file mode 100644 (file)
index 0000000..ce5b3b0
--- /dev/null
+++ b/systemd/ceph-exporter@.service.in
@@ -0,0 +1,29 @@
+[Unit]
+Description=Ceph cluster exporter daemon
+PartOf=ceph.target
+After=network-online.target local-fs.target
+Before=ceph.target
+Wants=network-online.target local-fs.target ceph.target ceph-mon.target
+
+[Service]
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-exporter -f --id %i --setuser ceph --setgroup ceph
+LockPersonality=true
+NoNewPrivileges=true
+PrivateDevices=yes
+PrivateTmp=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectSystem=full
+Restart=on-failure
+RestartSec=10
+RestrictSUIDSGID=true
+StartLimitBurst=3
+StartLimitInterval=30min
+
+[Install]
+WantedBy=multi-user.target ceph.target