From 6b69c205e7e748e22d58c9b45b55f2482357c104 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 01:14:14 -0500 Subject: [PATCH 1/6] standard cron Signed-off-by: Eric Nemchik --- root/defaults/crontabs/abc | 2 ++ root/etc/crontabs/abc | 2 -- root/etc/crontabs/root | 6 ----- .../{init-grav-config => init-crontab-config} | 0 .../dependencies.d/init-grav-config | 0 .../s6-rc.d/init-crontab-config/run | 22 +++++++++++++++++++ .../s6-rc.d/init-crontab-config/type | 1 + .../s6-overlay/s6-rc.d/init-crontab-config/up | 1 + .../user/contents.d/init-crontab-config | 0 9 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 root/defaults/crontabs/abc delete mode 100644 root/etc/crontabs/abc delete mode 100644 root/etc/crontabs/root rename root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/{init-grav-config => init-crontab-config} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-grav-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config diff --git a/root/defaults/crontabs/abc b/root/defaults/crontabs/abc new file mode 100644 index 0000000..2838462 --- /dev/null +++ b/root/defaults/crontabs/abc @@ -0,0 +1,2 @@ +# min hour day month weekday command +* * * * * cd /app/www/public; /usr/bin/php bin/grav scheduler 2>&1 diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc deleted file mode 100644 index 0c82001..0000000 --- a/root/etc/crontabs/abc +++ /dev/null @@ -1,2 +0,0 @@ -# min hour day month weekday command -* * * * * cd /app/www/public;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1 diff --git a/root/etc/crontabs/root b/root/etc/crontabs/root deleted file mode 100644 index f35d7bc..0000000 --- a/root/etc/crontabs/root +++ /dev/null @@ -1,6 +0,0 @@ -# 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 diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-grav-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-grav-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-crontab-config/dependencies.d/init-grav-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-grav-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run new file mode 100644 index 0000000..c49a50c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run @@ -0,0 +1,22 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +# make folders +mkdir -p \ + /config/crontabs + +## abc +# if crontabs do not exist in config +if [[ ! -f /config/crontabs/abc ]]; then + # copy crontab from system + 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 /defaults/crontabs/abc /config/crontabs/ +fi +# set permissions and import user crontabs +lsiown abc:abc /config/crontabs/abc +crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type @@ -0,0 +1 @@ +oneshot 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/user/contents.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config new file mode 100644 index 0000000..e69de29 From 9fd6322bf5352c85fd52f8a0c448cd75c47f0a6d Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 09:49:15 -0500 Subject: [PATCH 2/6] Fix perms Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-crontab-config/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run old mode 100644 new mode 100755 From 5163e21100b2705f6e3300d9ad05696fc3153099 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Fri, 18 Aug 2023 23:37:29 -0500 Subject: [PATCH 3/6] cron in base Signed-off-by: Eric Nemchik --- .../dependencies.d/init-crontab-config | 0 .../dependencies.d/init-grav-config | 0 .../s6-rc.d/init-crontab-config/run | 22 ------------------- .../s6-rc.d/init-crontab-config/type | 1 - .../s6-overlay/s6-rc.d/init-crontab-config/up | 1 - .../user/contents.d/init-crontab-config | 0 6 files changed, 24 deletions(-) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config rename root/etc/s6-overlay/s6-rc.d/{init-crontab-config => init-config-end}/dependencies.d/init-grav-config (100%) delete mode 100755 root/etc/s6-overlay/s6-rc.d/init-crontab-config/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-grav-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-grav-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-grav-config rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-grav-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run deleted file mode 100755 index c49a50c..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/run +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -# make folders -mkdir -p \ - /config/crontabs - -## abc -# if crontabs do not exist in config -if [[ ! -f /config/crontabs/abc ]]; then - # copy crontab from system - 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 /defaults/crontabs/abc /config/crontabs/ -fi -# set permissions and import user crontabs -lsiown abc:abc /config/crontabs/abc -crontab -u abc /config/crontabs/abc diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type deleted file mode 100644 index bdd22a1..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot 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 deleted file mode 100644 index d354111..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-crontab-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-crontab-config deleted file mode 100644 index e69de29..0000000 From 7abbe6336aa087a1d61ee5ac7b280546c9ce61cb Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 19 Aug 2023 10:16:54 -0500 Subject: [PATCH 4/6] Move crontabs to etc Signed-off-by: Eric Nemchik --- root/{defaults => etc}/crontabs/abc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename root/{defaults => etc}/crontabs/abc (100%) diff --git a/root/defaults/crontabs/abc b/root/etc/crontabs/abc similarity index 100% rename from root/defaults/crontabs/abc rename to root/etc/crontabs/abc From 11106b43268d527d6f7969ca6a118a960b22f2f6 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 2 Nov 2023 19:57:07 -0500 Subject: [PATCH 5/6] Update abc --- root/etc/crontabs/abc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc index 2838462..a92d0a4 100644 --- a/root/etc/crontabs/abc +++ b/root/etc/crontabs/abc @@ -1,2 +1,2 @@ # min hour day month weekday command -* * * * * cd /app/www/public; /usr/bin/php bin/grav scheduler 2>&1 +* * * * * cd /app/www/public; /usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1 From c47cd3b4052164da93821bbb51141b078a143ae9 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 2 Nov 2023 19:57:35 -0500 Subject: [PATCH 6/6] Update abc --- root/etc/crontabs/abc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc index a92d0a4..0c82001 100644 --- a/root/etc/crontabs/abc +++ b/root/etc/crontabs/abc @@ -1,2 +1,2 @@ # min hour day month weekday command -* * * * * cd /app/www/public; /usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1 +* * * * * cd /app/www/public;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1