From 68c72c5dff5fbe92bf399118860324dcdcec3b49 Mon Sep 17 00:00:00 2001 From: steven Date: Thu, 31 Oct 2024 11:40:57 +0000 Subject: [PATCH] systemd: use CMake install prefix in templates The current systemd services use hard coded paths. This commit uses CMake install prefix in the templates to setup paths to executables where they are actually installed. Signed-off-by: steven --- systemd/ceph-crash.service.in | 2 +- systemd/ceph-exporter.service.in | 2 +- systemd/ceph-fuse@.service.in | 2 +- systemd/ceph-immutable-object-cache@.service.in | 2 +- systemd/ceph-mds@.service.in | 2 +- systemd/ceph-mgr@.service.in | 2 +- systemd/ceph-mon@.service.in | 2 +- systemd/ceph-osd@.service.in | 2 +- systemd/ceph-radosgw@.service.in | 2 +- systemd/ceph-rbd-mirror@.service.in | 2 +- systemd/ceph-volume@.service | 2 +- systemd/cephfs-mirror@.service.in | 2 +- systemd/rbdmap.service.in | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/systemd/ceph-crash.service.in b/systemd/ceph-crash.service.in index 8304dd61220..f01132446fc 100644 --- a/systemd/ceph-crash.service.in +++ b/systemd/ceph-crash.service.in @@ -3,7 +3,7 @@ Description=Ceph crash dump collector [Service] Type=simple -ExecStart=/usr/bin/ceph-crash +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-crash Restart=always RestartSec=10 StartLimitInterval=10min diff --git a/systemd/ceph-exporter.service.in b/systemd/ceph-exporter.service.in index f4f6d05c4b4..ce5b3b0a93c 100644 --- a/systemd/ceph-exporter.service.in +++ b/systemd/ceph-exporter.service.in @@ -7,7 +7,7 @@ Wants=network-online.target local-fs.target ceph.target ceph-mon.target [Service] ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-exporter -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-exporter -f --id %i --setuser ceph --setgroup ceph LockPersonality=true NoNewPrivileges=true PrivateDevices=yes diff --git a/systemd/ceph-fuse@.service.in b/systemd/ceph-fuse@.service.in index 0bde59a09c3..add962c4018 100644 --- a/systemd/ceph-fuse@.service.in +++ b/systemd/ceph-fuse@.service.in @@ -7,7 +7,7 @@ PartOf=ceph-fuse.target [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ -ExecStart=/usr/bin/ceph-fuse -f %I +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-fuse -f %I LockPersonality=true MemoryDenyWriteExecute=true NoNewPrivileges=true diff --git a/systemd/ceph-immutable-object-cache@.service.in b/systemd/ceph-immutable-object-cache@.service.in index 827444ba7da..7b2dc71ca28 100644 --- a/systemd/ceph-immutable-object-cache@.service.in +++ b/systemd/ceph-immutable-object-cache@.service.in @@ -7,7 +7,7 @@ PartOf=ceph-immutable-object-cache.target [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-immutable-object-cache -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-immutable-object-cache -f --id %i --setuser ceph --setgroup ceph LockPersonality=true MemoryDenyWriteExecute=true NoNewPrivileges=true diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in index 628b402af9d..b2fc3374b56 100644 --- a/systemd/ceph-mds@.service.in +++ b/systemd/ceph-mds@.service.in @@ -8,7 +8,7 @@ Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.targe [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-mds -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-mds -f --id %i --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in index 0c89b6f85ec..42544d51cfe 100644 --- a/systemd/ceph-mgr@.service.in +++ b/systemd/ceph-mgr@.service.in @@ -8,7 +8,7 @@ Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.targe [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-mgr -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-mgr -f --id %i --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in index 26626f465aa..06c6728422c 100644 --- a/systemd/ceph-mon@.service.in +++ b/systemd/ceph-mon@.service.in @@ -12,7 +12,7 @@ Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.targe [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-mon -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-mon -f --id %i --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in index eb67c21e047..18c0591f560 100644 --- a/systemd/ceph-osd@.service.in +++ b/systemd/ceph-osd@.service.in @@ -8,7 +8,7 @@ Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.targe [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/ceph-osd -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/ceph-osd -f --id %i --setuser ceph --setgroup ceph ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --id %i LimitNOFILE=1048576 LimitNPROC=1048576 diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in index a2d28c6ca6c..2146912b3ae 100644 --- a/systemd/ceph-radosgw@.service.in +++ b/systemd/ceph-radosgw@.service.in @@ -7,7 +7,7 @@ Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.targe [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ -ExecStart=/usr/bin/radosgw -f --name client.%i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/radosgw -f --name client.%i --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/ceph-rbd-mirror@.service.in b/systemd/ceph-rbd-mirror@.service.in index d95b4288e94..caeedcbfca2 100644 --- a/systemd/ceph-rbd-mirror@.service.in +++ b/systemd/ceph-rbd-mirror@.service.in @@ -7,7 +7,7 @@ PartOf=ceph-rbd-mirror.target [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ ExecReload=/bin/kill -HUP $MAINPID -ExecStart=/usr/bin/rbd-mirror -f --id %i --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/rbd-mirror -f --id %i --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/ceph-volume@.service b/systemd/ceph-volume@.service index c21002cecb9..78bfc256c76 100644 --- a/systemd/ceph-volume@.service +++ b/systemd/ceph-volume@.service @@ -7,7 +7,7 @@ Wants=local-fs.target Type=oneshot KillMode=none Environment=CEPH_VOLUME_TIMEOUT=10000 -ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT /usr/sbin/ceph-volume-systemd %i' +ExecStart=/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT @CMAKE_INSTALL_PREFIX@/sbin/ceph-volume-systemd %i' TimeoutSec=0 [Install] diff --git a/systemd/cephfs-mirror@.service.in b/systemd/cephfs-mirror@.service.in index 9f83c1d9c3d..5367e76f5d3 100644 --- a/systemd/cephfs-mirror@.service.in +++ b/systemd/cephfs-mirror@.service.in @@ -6,7 +6,7 @@ PartOf=cephfs-mirror.target [Service] EnvironmentFile=-@SYSTEMD_ENV_FILE@ -ExecStart=/usr/bin/cephfs-mirror --id %i -f --setuser ceph --setgroup ceph +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/cephfs-mirror --id %i -f --setuser ceph --setgroup ceph LimitNOFILE=1048576 LimitNPROC=1048576 LockPersonality=true diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in index 6644508cf0d..0933676d2ac 100644 --- a/systemd/rbdmap.service.in +++ b/systemd/rbdmap.service.in @@ -9,9 +9,9 @@ EnvironmentFile=-@SYSTEMD_ENV_FILE@ Environment=RBDMAPFILE=/etc/ceph/rbdmap Type=oneshot RemainAfterExit=yes -ExecStart=/usr/bin/rbdmap map -ExecReload=/usr/bin/rbdmap map -ExecStop=/usr/bin/rbdmap unmap-all +ExecStart=@CMAKE_INSTALL_PREFIX@/bin/rbdmap map +ExecReload=@CMAKE_INSTALL_PREFIX@/bin/rbdmap map +ExecStop=@CMAKE_INSTALL_PREFIX@/bin/rbdmap unmap-all [Install] WantedBy=multi-user.target -- 2.39.5