From f49a7b4c9fb8fcd20ba703bf64e1f8b3f6431ccf3e033c0d44906ec55a78563f Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 10 Aug 2019 17:30:39 +0000 Subject: [PATCH] - Behavioral change: Use cron only for older RHEL/CentOS versions (along with openSUSE < 12.3). Everything else now uses systemd. Please adopt accordingly! Refer to README.md for OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=43 --- README.SUSE => README.maintainer | 4 ++-- dehydrated.changes | 7 +++++++ dehydrated.spec | 12 ++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) rename README.SUSE => README.maintainer (97%) diff --git a/README.SUSE b/README.maintainer similarity index 97% rename from README.SUSE rename to README.maintainer index b471228..5fafa1f 100644 --- a/README.SUSE +++ b/README.maintainer @@ -2,14 +2,14 @@ Acquiring TLS Certificates with Dehydrated ========================================== -The SUSE dehydrated package has been designed to make acquiring TLS +The dehydrated package has been designed to make acquiring TLS certificates (aka SSL Certificates) as simple as possible, while still being useful in a broad amount of use cases. Please consult the dehydrated man page, then continue reading here. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -IMPORTANT: On systemd-enabled system (SLE12+), you need to enable the update +IMPORTANT: On systemd-based systems, you need to enable the update timer, which has obsoleted the cron job. This is independent on which method you chose from below! diff --git a/dehydrated.changes b/dehydrated.changes index 6d5499f..11f1cd4 100644 --- a/dehydrated.changes +++ b/dehydrated.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 10 17:18:25 UTC 2019 - Daniel Molkentin + +- Behavioral change: Use cron only for older RHEL/CentOS versions + (along with openSUSE < 12.3). Everything else now uses systemd. + Please adopt accordingly! Refer to README.md for + ------------------------------------------------------------------- Wed Jun 26 11:03:27 UTC 2019 - Daniel Molkentin diff --git a/dehydrated.spec b/dehydrated.spec index efcb83b..826b202 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -21,12 +21,12 @@ %define _home %{_sysconfdir}/dehydrated %define _postrunhooks %{_home}/postrun-hooks.d -%if 0%{?suse_version} > 1230 -%define _lock_dir /run/dehydrated -%bcond_without systemd -%else +%if 0%{?suse_version} <= 1230 || 0%{?rhel_version} <= 600 || 0%{?centos_version} <= 600 %define _lock_dir %{_localstatedir}/run/dehydrated %bcond_with systemd +%else +%define _lock_dir /run/dehydrated +%bcond_without systemd %endif %if 0%{?is_opensuse} || %{defined fedora} @@ -60,7 +60,7 @@ Source4: dehydrated.cron.in Source5: dehydrated.tmpfiles.d Source6: dehydrated.service.in Source7: dehydrated.timer -Source9: README.SUSE +Source9: README.maintainer Source10: README.Fedora Source11: README.hooks Source12: %{name}-%{version}.tar.gz.asc @@ -269,7 +269,7 @@ diff -urN docs/examples/config %{buildroot}%{_home}/config ||: %attr(-,%{_user},root) %dir %{_localstatedir}/lib/acme-challenge %{_mandir}/man1/* %doc LICENSE README.md docs/*.md docs/*.jpg -%doc README.SUSE +%doc README.maintainer %if %{defined redhat} %doc README.Fedora %endif