From c73d76e4c6e1fd601c3236c4a23e846beff19523 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 01:18:19 -0500 Subject: [PATCH] standard cron Signed-off-by: Eric Nemchik --- root/defaults/crontabs/abc | 2 ++ root/etc/crontabs/root | 10 ---------- .../{init-crontabs-config => init-crontab-config} | 0 .../dependencies.d/init-transmission-config | 0 .../run | 14 +++++++------- .../type | 0 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up | 1 + .../etc/s6-overlay/s6-rc.d/init-crontabs-config/up | 1 - root/etc/s6-overlay/s6-rc.d/svc-cron/run | 2 +- .../{init-crontabs-config => init-crontab-config} | 0 10 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 root/defaults/crontabs/abc delete mode 100644 root/etc/crontabs/root rename root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/{init-crontabs-config => init-crontab-config} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/dependencies.d/init-transmission-config (100%) rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/run (60%) mode change 100755 => 100644 rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{init-crontabs-config => init-crontab-config} (100%) diff --git a/root/defaults/crontabs/abc b/root/defaults/crontabs/abc new file mode 100644 index 00000000..d9167cbd --- /dev/null +++ b/root/defaults/crontabs/abc @@ -0,0 +1,2 @@ +# min hour day month weekday command +0 3 * * * /app/blocklist-update.sh 2>&1 diff --git a/root/etc/crontabs/root b/root/etc/crontabs/root deleted file mode 100644 index 481bc04c..00000000 --- a/root/etc/crontabs/root +++ /dev/null @@ -1,10 +0,0 @@ -# do daily/weekly/monthly maintenance -# min hour day month weekday command -*/15 * * * * run-parts /etc/periodic/15min -0 * * * * run-parts /etc/periodic/hourly -0 2 * * * run-parts /etc/periodic/daily -0 3 * * 6 run-parts /etc/periodic/weekly -0 5 1 * * run-parts /etc/periodic/monthly - -# run daily blocklist update -0 3 * * * /app/blocklist-update.sh 2>&1 diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontabs-config rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-transmission-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-transmission-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-transmission-config rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-transmission-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run old mode 100755 new mode 100644 similarity index 60% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/run index 1080bb60..c49a50c5 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run @@ -5,18 +5,18 @@ mkdir -p \ /config/crontabs -## root +## abc # if crontabs do not exist in config -if [[ ! -f /config/crontabs/root ]]; then +if [[ ! -f /config/crontabs/abc ]]; then # copy crontab from system - if crontab -l -u root; then - crontab -l -u root >/config/crontabs/root + if crontab -l -u abc; then + crontab -l -u abc >/config/crontabs/abc fi # if crontabs still do not exist in config (were not copied from system) # copy crontab from included defaults (using -n, do not overwrite an existing file) - cp -n /etc/crontabs/root /config/crontabs/ + cp -n /defaults/crontabs/abc /config/crontabs/ fi # set permissions and import user crontabs -lsiown root:root /config/crontabs/root -crontab -u root /config/crontabs/root +lsiown abc:abc /config/crontabs/abc +crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up new file mode 100644 index 00000000..d3541118 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up deleted file mode 100644 index 006d8141..00000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-crontabs-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run index 5eaadfdc..ccc3374d 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-cron/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-cron/run @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -exec /usr/sbin/crond -f -S -l 5 +exec busybox crond -f -S -l 5 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontabs-config rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config