diff options
5 files changed, 23 insertions, 9 deletions
diff --git a/satellit_installer/static_files/slxadmin/etc/cron.d/slx-admin b/satellit_installer/static_files/slxadmin/etc/cron.d/slx-admin deleted file mode 100644 index 1e6cd11..0000000 --- a/satellit_installer/static_files/slxadmin/etc/cron.d/slx-admin +++ /dev/null @@ -1,7 +0,0 @@ -# Trigger taskmanager init on boot - -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -# web-cron runs every 5 minutes -*/5 * * * * www-data /opt/openslx/slxadmin-cronscript diff --git a/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.service b/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.service new file mode 100644 index 0000000..3a29971 --- /dev/null +++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.service @@ -0,0 +1,7 @@ +[Unit] +Description=SLX-Admin cron script +RefuseManualStart=yes + +[Service] +Type=oneshot +ExecStart=/opt/openslx/slxadmin-cronscript diff --git a/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.timer b/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.timer new file mode 100644 index 0000000..680c28e --- /dev/null +++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/slx-cron.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Trigger SLX-Admin Cron-Script + +[Timer] +OnCalendar=*:0/5 +AccuracySec=5 +RandomizedDelaySec=0 + +[Install] +WantedBy=timers.target diff --git a/satellit_installer/static_files/slxadmin/etc/systemd/system/timers.target.wants/slx-cron.timer b/satellit_installer/static_files/slxadmin/etc/systemd/system/timers.target.wants/slx-cron.timer new file mode 120000 index 0000000..9590a5c --- /dev/null +++ b/satellit_installer/static_files/slxadmin/etc/systemd/system/timers.target.wants/slx-cron.timer @@ -0,0 +1 @@ +../slx-cron.timer
\ No newline at end of file diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index abd132a..aa7bf1b 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -523,8 +523,11 @@ if [ -n "$TGZ_SLXADMIN" ]; then # New scripts supplied diffcp "slxadmin" "/opt/openslx/slxadmin-cronscript" diffcp "slxadmin" "/opt/openslx/slxadmin-bootscript" - # New crontab supplied - diffcp "slxadmin" "/etc/cron.d/slx-admin" + # New crontab supplied - now as systemd timer + rm -f -- "/etc/cron.d/slx-admin" + diffcp "slxadmin" "/etc/systemd/system/slx-cron.service" + diffcp "slxadmin" "/etc/systemd/system/slx-cron.timer" + diffcp "slxadmin" "/etc/systemd/system/timers.target.wants/slx-cron.timer" # Service diffcp "slxadmin" "/etc/systemd/system/slxadmin-boot.service" ln -nfs "../slxadmin-boot.service" "/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service" |