From 016e39ebb9f7be8d0e7c0a1705c638a86e8becbf Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 01:18:51 -0500 Subject: [PATCH 1/5] standard cron Signed-off-by: Eric Nemchik --- root/app/update.sh | 6 +++++ root/defaults/crontabs/abc | 2 ++ root/defaults/update.sh | 7 ------ root/defaults/wg3-cron | 1 - ...webgrabplus-config => init-crontab-config} | 0 .../dependencies.d/init-webgrabplus-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 + .../s6-rc.d/init-webgrabplus-config/run | 19 +++++----------- root/etc/s6-overlay/s6-rc.d/svc-cron/run | 2 +- .../user/contents.d/init-crontab-config | 0 12 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 root/app/update.sh create mode 100644 root/defaults/crontabs/abc delete mode 100755 root/defaults/update.sh delete mode 100644 root/defaults/wg3-cron rename root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/{init-webgrabplus-config => init-crontab-config} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-webgrabplus-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/app/update.sh b/root/app/update.sh new file mode 100644 index 0000000..f91d2b9 --- /dev/null +++ b/root/app/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +cd /app/wg++/bin.net || exit 1 + +/app/dotnet/dotnet "WebGrab+Plus.dll" "/config" diff --git a/root/defaults/crontabs/abc b/root/defaults/crontabs/abc new file mode 100644 index 0000000..26201a6 --- /dev/null +++ b/root/defaults/crontabs/abc @@ -0,0 +1,2 @@ +# min hour day month weekday command +2 3 * * * /app/update.sh 2>&1 diff --git a/root/defaults/update.sh b/root/defaults/update.sh deleted file mode 100755 index e09c183..0000000 --- a/root/defaults/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd /app/wg++/bin.net || exit - -/app/dotnet/dotnet "WebGrab+Plus.dll" "/config" - -exit 0 diff --git a/root/defaults/wg3-cron b/root/defaults/wg3-cron deleted file mode 100644 index b73f28f..0000000 --- a/root/defaults/wg3-cron +++ /dev/null @@ -1 +0,0 @@ -2 3 * * * /bin/bash /defaults/update.sh diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-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-webgrabplus-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-webgrabplus-config b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-webgrabplus-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..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file 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-webgrabplus-config/run b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run index 38cf0a0..95a00e3 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run @@ -1,6 +1,11 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash +mkdir -p \ + /app/wg++/bin.net/WebGrab+Plus \ + /config/License +ln -sf /config/License /app/wg++/bin.net/WebGrab+Plus + # copy config if [[ ! -e /config/WebGrab++.config.xml ]]; then cp /defaults/WebGrab++.config.xml /config/ @@ -10,20 +15,6 @@ if [[ ! -e /config/siteini.pack ]]; then cp -R /defaults/ini/siteini.pack /config/ fi -# warn user about changing name for crontab file -echo "******** Please use the file wg3-cron to adjust the scheduled time for running WebGrab++. wg-cron can now be deleted. ********" - -# add cron file for running webgrab+plus -if [[ ! -e /config/wg3-cron ]]; then - cp /defaults/wg3-cron /config/wg3-cron -fi - -crontab -u abc /config/wg3-cron - -mkdir -p /app/wg++/bin.net/WebGrab+Plus -mkdir -p /config/License -ln -sf /config/License /app/wg++/bin.net/WebGrab+Plus - # permissions lsiown -R abc:abc \ /app \ 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 67c11bb..ccc3374 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 -L 1 +exec busybox crond -f -S -l 5 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 013e60828f6a2bc415e854eb92ea64d5b8a2cfae Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 30 Jul 2023 09:50:38 -0500 Subject: [PATCH 2/5] 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 d00d1d18ab2f889fe29311bbeaaeeb9d62b25396 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Fri, 18 Aug 2023 23:07:38 -0500 Subject: [PATCH 3/5] cron in base Signed-off-by: Eric Nemchik --- .../s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-cron/run | 4 ---- root/etc/s6-overlay/s6-rc.d/svc-cron/type | 1 - root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron | 0 4 files changed, 5 deletions(-) delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services delete mode 100755 root/etc/s6-overlay/s6-rc.d/svc-cron/run delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-cron/type delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run deleted file mode 100755 index ccc3374..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-cron/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -exec busybox crond -f -S -l 5 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/type b/root/etc/s6-overlay/s6-rc.d/svc-cron/type deleted file mode 100644 index 5883cff..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-cron/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron deleted file mode 100644 index e69de29..0000000 From 4e2dab5b20c0b323f3eb334a3dc569126372e220 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Fri, 18 Aug 2023 23:21:14 -0500 Subject: [PATCH 4/5] cron in base Signed-off-by: Eric Nemchik --- .../dependencies.d/init-crontab-config | 0 .../dependencies.d/init-webgrabplus-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-webgrabplus-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-webgrabplus-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-config similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-webgrabplus-config rename to root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-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 3d92b15..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-crontab-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file 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 4a36e00df763a38a24fcbebeff9af638a2e36e66 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 19 Aug 2023 10:17:56 -0500 Subject: [PATCH 5/5] 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