From 54cc7989701eb5d8ff561c6891f0a819cc54dcae Mon Sep 17 00:00:00 2001 From: Thomas Ward Date: Sun, 23 Feb 2025 18:17:04 +0000 Subject: [PATCH] Fix DebBug #1098477, salsa issue nginx-team/nginx:#23 --- debian/changelog | 7 +++++++ debian/nginx-common.nginx.service | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0f2ce75..c1224e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ nginx (1.26.3-3) UNRELEASED; urgency=medium + [ Jan Mojžíš ] * d/changelog: fix whitespace in 1.26.3-2 record * d/control: add libnginx-mod-http-lua dependency for nginx-extras package for riscv64 platform + [ Thomas Ward ] + * d/nginx-common.nginx.service: Add ConditionFileIsExecutable to + SystemD service file, prevents starting of service if nginx is + not installed (which can happen if nginx-common is installed + independently from `nginx` itself (Closes: #1098477) + -- Jan Mojžíš Wed, 12 Feb 2025 19:37:40 +0100 nginx (1.26.3-2) unstable; urgency=medium diff --git a/debian/nginx-common.nginx.service b/debian/nginx-common.nginx.service index a63fa0f..510c542 100644 --- a/debian/nginx-common.nginx.service +++ b/debian/nginx-common.nginx.service @@ -25,6 +25,7 @@ ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile /run/nginx.pid TimeoutStopSec=5 KillMode=mixed +ConditionFileIsExecutable=/usr/sbin/nginx [Install] WantedBy=multi-user.target