From bb6d8bed4f2bf2eb1bdd07681a1055babd673fa0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 01:11:14 -0500 Subject: [PATCH] standard cron Signed-off-by: Eric Nemchik --- root/defaults/crontabs/abc | 2 ++ root/etc/crontabs/abc | 1 - .../dependencies.d/init-eol-check | 0 .../s6-rc.d/{init-crontabs-config => init-crontab-config}/run | 2 +- .../s6-rc.d/{init-crontabs-config => init-crontab-config}/type | 0 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up | 1 + root/etc/s6-overlay/s6-rc.d/init-crontabs-config/up | 1 - .../{init-crontabs-config => init-crontab-config} | 0 .../contents.d/{init-crontabs-config => init-crontab-config} | 0 9 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 root/defaults/crontabs/abc delete mode 100644 root/etc/crontabs/abc rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/dependencies.d/init-eol-check (100%) rename root/etc/s6-overlay/s6-rc.d/{init-crontabs-config => init-crontab-config}/run (92%) 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/init-diskover-config/dependencies.d/{init-crontabs-config => init-crontab-config} (100%) 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 0000000..17a7624 --- /dev/null +++ b/root/defaults/crontabs/abc @@ -0,0 +1,2 @@ +# min hour day month weekday command +#0 3 * * * python3 /app/diskover/diskover.py -i diskover-my_index_name /data 2>&1 diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc deleted file mode 100644 index 2d7869c..0000000 --- a/root/etc/crontabs/abc +++ /dev/null @@ -1 +0,0 @@ -#0 3 * * * python3 /app/diskover/diskover.py -i diskover-my_index_name /data diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-eol-check b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-eol-check similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontabs-config/dependencies.d/init-eol-check rename to root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-eol-check 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 92% 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 4a7c5b2..6396800 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run @@ -15,7 +15,7 @@ if [[ ! -f /config/crontabs/abc ]]; then # 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/abc /config/crontabs/ + cp -n /defaults/crontabs/abc /config/crontabs/ fi # set permissions and import user crontabs 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 0000000..d354111 --- /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 006d814..0000000 --- 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/init-diskover-config/dependencies.d/init-crontabs-config b/root/etc/s6-overlay/s6-rc.d/init-diskover-config/dependencies.d/init-crontab-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-diskover-config/dependencies.d/init-crontabs-config rename to root/etc/s6-overlay/s6-rc.d/init-diskover-config/dependencies.d/init-crontab-config 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