From 870e305805b26f6abd5629b5a323c3f74c3b289f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 14 Jan 2026 15:22:20 +0100 Subject: [PATCH 1/3] systemd control and defaults file same as in Debian --- rpm/zebrasrv.service | 2 +- rpm/zebrasrv.sysconfig | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rpm/zebrasrv.service b/rpm/zebrasrv.service index bba458e8..6074c495 100644 --- a/rpm/zebrasrv.service +++ b/rpm/zebrasrv.service @@ -10,7 +10,7 @@ Type=forking EnvironmentFile=/etc/sysconfig/zebrasrv ExecStart=/bin/sh -c "exec ${DAEMON} ${OPTIONS} -p /run/zebrasrv.pid -D" PIDFile=/run/zebrasrv.pid -ReStart=on-abnormal +Restart=on-abnormal [Install] WantedBy=multi-user.target diff --git a/rpm/zebrasrv.sysconfig b/rpm/zebrasrv.sysconfig index 48965395..be69523b 100644 --- a/rpm/zebrasrv.sysconfig +++ b/rpm/zebrasrv.sysconfig @@ -1,5 +1,11 @@ -# zebrasrv sysconfig file -CONFIG=/etc/idzebra/zebra.cfg -# this is used in zebrasrv systemd service file (not only the final OPTIONS value) +# Defaults for zebrasrv systemd service +# This is a POSIX shell fragment + +# zebra.cfg (will be supplied with option -c) +CONFIG="/etc/idzebra/zebra.cfg" + +# Full path to zebra server. Referred to in zebrasrv.service DAEMON=/usr/bin/zebrasrv-2.0 -OPTIONS="-c $CONFIG -l /var/log/zebrasrv.log -u nobody tcp:@6:2100" + +# Options that are passed to the Daemon and used in zebrasrv.service +OPTIONS="-l /var/log/zebrasrv.log -u nobody -c ${CONFIG} tcp:@:2100" From 1c9c2b527ffe8dad2c61e9d777a87b4004618413 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Jan 2026 14:27:30 +0100 Subject: [PATCH 2/3] Align again --- rpm/zebrasrv.service | 2 +- rpm/zebrasrv.sysconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/zebrasrv.service b/rpm/zebrasrv.service index 6074c495..2de813e0 100644 --- a/rpm/zebrasrv.service +++ b/rpm/zebrasrv.service @@ -2,7 +2,7 @@ [Unit] Description=Index Data Zebra server -Documentation=man:idzebra(1) +Documentation=man:zebrasrv(8) After=network.target [Service] diff --git a/rpm/zebrasrv.sysconfig b/rpm/zebrasrv.sysconfig index be69523b..ffe5e65e 100644 --- a/rpm/zebrasrv.sysconfig +++ b/rpm/zebrasrv.sysconfig @@ -8,4 +8,4 @@ CONFIG="/etc/idzebra/zebra.cfg" DAEMON=/usr/bin/zebrasrv-2.0 # Options that are passed to the Daemon and used in zebrasrv.service -OPTIONS="-l /var/log/zebrasrv.log -u nobody -c ${CONFIG} tcp:@:2100" +OPTIONS="-l /var/log/zebrasrv.log -u nobody -c ${CONFIG} tcp:@6:2100" From b84e38dea0b58faf193ae0172258b79da98245f0 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Jan 2026 14:30:41 +0100 Subject: [PATCH 3/3] Quoting --- debian/idzebra-2.0-utils.zebrasrv.default | 2 +- rpm/zebrasrv.sysconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/idzebra-2.0-utils.zebrasrv.default b/debian/idzebra-2.0-utils.zebrasrv.default index ffe5e65e..4b75fdec 100644 --- a/debian/idzebra-2.0-utils.zebrasrv.default +++ b/debian/idzebra-2.0-utils.zebrasrv.default @@ -5,7 +5,7 @@ CONFIG="/etc/idzebra/zebra.cfg" # Full path to zebra server. Referred to in zebrasrv.service -DAEMON=/usr/bin/zebrasrv-2.0 +DAEMON="/usr/bin/zebrasrv-2.0" # Options that are passed to the Daemon and used in zebrasrv.service OPTIONS="-l /var/log/zebrasrv.log -u nobody -c ${CONFIG} tcp:@6:2100" diff --git a/rpm/zebrasrv.sysconfig b/rpm/zebrasrv.sysconfig index ffe5e65e..4b75fdec 100644 --- a/rpm/zebrasrv.sysconfig +++ b/rpm/zebrasrv.sysconfig @@ -5,7 +5,7 @@ CONFIG="/etc/idzebra/zebra.cfg" # Full path to zebra server. Referred to in zebrasrv.service -DAEMON=/usr/bin/zebrasrv-2.0 +DAEMON="/usr/bin/zebrasrv-2.0" # Options that are passed to the Daemon and used in zebrasrv.service OPTIONS="-l /var/log/zebrasrv.log -u nobody -c ${CONFIG} tcp:@6:2100"