From 7e14d21687fc4b821b6669ab2fa65eeb80ac843629d60143602dbe498770f32c Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 2 Feb 2024 17:35:37 +0000 Subject: [PATCH 1/2] - Add user/group provides for rpm 4.19 OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=84 --- dehydrated.changes | 5 +++++ dehydrated.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dehydrated.changes b/dehydrated.changes index a7dae2c..8f7654d 100644 --- a/dehydrated.changes +++ b/dehydrated.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 2 17:34:54 UTC 2024 - Marcus Rueckert + +- Add user/group provides for rpm 4.19 + ------------------------------------------------------------------- Sat Oct 29 05:03:26 UTC 2022 - Daniel Molkentin diff --git a/dehydrated.spec b/dehydrated.spec index 335a528..5cdad6d 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -88,6 +88,8 @@ Requires(pre): %{_sbindir}/useradd Obsoletes: dehydrated-lighttpd < %{version}-%{release} Obsoletes: letsencrypt.sh < %{version} Provides: letsencrypt.sh = %{version} +Provides: user(%{_user}) +Provides: group(%{_user}) %if %{with nginx} BuildRequires: nginx %endif From 78251e0f3ac1a59734cbefb329a09ff3d55c8f66ce1db02953c98f01abe91e09 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 2 Feb 2024 17:35:59 +0000 Subject: [PATCH 2/2] Accepting request 1138520 from home:crameleon:branches:security:dehydrated - Add instance name to unit description for easier journal identification on systems with multiple instances - Check instance specific configuration file instead of the irrelevant main one OBS-URL: https://build.opensuse.org/request/show/1138520 OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=85 --- dehydrated.changes | 6 ++++++ dehydrated.spec | 2 +- dehydrated@.service | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dehydrated.changes b/dehydrated.changes index 8f7654d..53b8bc1 100644 --- a/dehydrated.changes +++ b/dehydrated.changes @@ -3,6 +3,12 @@ Fri Feb 2 17:34:54 UTC 2024 - Marcus Rueckert - Add user/group provides for rpm 4.19 +------------------------------------------------------------------- +Sat Jan 13 23:52:53 UTC 2024 - Georg Pfuetzenreuter + +- Add instance name to unit description +- Check instance specific configuration + ------------------------------------------------------------------- Sat Oct 29 05:03:26 UTC 2022 - Daniel Molkentin diff --git a/dehydrated.spec b/dehydrated.spec index 5cdad6d..8194c3c 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -1,7 +1,7 @@ # # spec file for package dehydrated # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/dehydrated@.service b/dehydrated@.service index c5e26b5..b0590f2 100644 --- a/dehydrated@.service +++ b/dehydrated@.service @@ -1,6 +1,6 @@ [Unit] -Description=Certificate Update Runner for Dehydrated -ConditionPathExists=/etc/dehydrated/config +Description=Certificate Update Runner for Dehydrated instance %i +ConditionPathExists=/etc/dehydrated-%i/config After=network-online.target Wants=acmeresponder.socket PartOf=dehydrated.target