commit 3531686d7c73e144cd8ff68ce19070aa516f392c
Author: Bartek Szady <b...@bszx.eu>
Date:   Tue Dec 31 19:47:53 2024 +0100

    - systemd-cronjobs support added
    - release 2

 cronjob-dehydrated.service |  6 ++++++
 cronjob-dehydrated.timer   |  9 +++++++++
 dehydrated.spec            | 19 ++++++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index 423bc3c..17e712b 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,7 @@
 Summary:       letsencrypt/acme client implemented as a shell-script
 Name:          dehydrated
 Version:       0.7.1
-Release:       1
+Release:       2
 License:       MIT
 Group:         Applications/Networking
 Source0:       
https://github.com/dehydrated-io/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -13,11 +13,13 @@ Source5:    hook.sh
 Source6:       hook-dns-01.sh
 Source7:       crontab
 Source8:       sudoers
+Source9:       cronjob-%{name}.timer
+Source10:      cronjob-%{name}.service
 Patch0:                pld.patch
 URL:           https://dehydrated.io/
 BuildRequires: rpmbuild(macros) >= 1.713
 Requires:      ca-certificates
-Requires:      crondaemon
+Requires:      cronjobs
 Requires:      curl
 Requires:      diffutils
 Requires:      grep
@@ -53,11 +55,12 @@ Current features:
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P 0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d 
$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/{cron,sudoers}.d} \
+       $RPM_BUILD_ROOT%{systemdunitdir} \
        $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge,certs}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
@@ -71,14 +74,22 @@ cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}
 
 %pre
 %groupadd -g 184 dehydrated
 
+%post
+%systemd_post cronjob-dehydrated.timer
+
+%preun
+%systemd_preun cronjob-dehydrated.timer
+
 %postun
 if [ "$1" = "0" ]; then
        %groupremove dehydrated
 fi
+%systemd_reload
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,6 +132,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/domains.txt
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/hook.sh
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/hook-dns-01.sh
+%{systemdunitdir}/cronjob-dehydrated.service
+%{systemdunitdir}/cronjob-dehydrated.timer
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %attr(751,root,root) /var/lib/%{name}
 %dir %attr(700,root,root) /var/lib/%{name}/accounts
diff --git a/cronjob-dehydrated.service b/cronjob-dehydrated.service
new file mode 100644
index 0000000..f1356db
--- /dev/null
+++ b/cronjob-dehydrated.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=letsencrypt/acme client cronjob
+
+[Service]
+ExecStart=/usr/sbin/dehydrated -c
+StandardOutput=null
diff --git a/cronjob-dehydrated.timer b/cronjob-dehydrated.timer
new file mode 100644
index 0000000..60fd696
--- /dev/null
+++ b/cronjob-dehydrated.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=letsencrypt/acme client cronjob timer
+
+[Timer]
+OnCalendar=Tue *-*-* 02:42:00
+Persistent=true
+
+[Install]
+WantedBy=cronjobs.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/3531686d7c73e144cd8ff68ce19070aa516f392c

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to