From 0d707762c0bad75e2f6ab6a7d6dd73f66e0a24a0b0a17560c7e9ed0a0b334c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 29 Dec 2020 20:47:08 +0000 Subject: [PATCH] Accepting request 859055 from home:gladiac:mailman3 - Fix quarter hourly timer OBS-URL: https://build.opensuse.org/request/show/859055 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=32 --- python-HyperKitty.changes | 5 +++++ python-HyperKitty.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes index 81fed54..7f78041 100644 --- a/python-HyperKitty.changes +++ b/python-HyperKitty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 28 08:32:51 UTC 2020 - Andreas Schneider + +- Fix quarter hourly timer + ------------------------------------------------------------------- Sun Dec 20 14:37:27 UTC 2020 - Andreas Schneider diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec index c4c31cf..a106ef8 100644 --- a/python-HyperKitty.spec +++ b/python-HyperKitty.spec @@ -220,14 +220,14 @@ for job in \ if [ "${job}" = "minutely" ]; then hyperkitty_runjob_delay="RandomizedDelaySec=15s" elif [ "${job}" = "quarter-hourly" ]; then - hyperkitty_runjob_calendar="OnCalendar=quarterly" + hyperkitty_runjob_calendar="OnCalendar=*:0/15" hyperkitty_runjob_delay="RandomizedDelaySec=2m" # The real jobname is with an underscore hyperkitty_runjob_name="quarter_hourly" fi - sed -i "s/@HYPERKITTY_RUNJOB_CALENDAR@/${hyperkitty_runjob_calendar}/g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer - sed -i "s/@HYPERKITTY_RUNJOB_DELAY@/${hyperkitty_runjob_delay}/g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer - sed -i "s/@HYPERKITTY_RUNJOB@/${hyperkitty_runjob_name}/g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer + sed -i "s#@HYPERKITTY_RUNJOB_CALENDAR@#${hyperkitty_runjob_calendar}#g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer + sed -i "s#@HYPERKITTY_RUNJOB_DELAY@#${hyperkitty_runjob_delay}#g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer + sed -i "s#@HYPERKITTY_RUNJOB@#${hyperkitty_runjob_name}#g" %{buildroot}%{_unitdir}/hyperkitty-runjob-${job}.timer done %check