Merge pull request #13 from linuxserver/standard-cron

standard cron
linuxserver · Nov 19, 2023 · 92458ff · 92458ff
2 parents dbfa774 + 51b9c5f
commit 92458ff
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 56 deletions.
diff --git a/root/defaults/crontabs/root b/root/defaults/crontabs/root
@@ -0,0 +1,3 @@
+# min   hour    day     month   weekday command
+#0       */4     *       *       *       rsnapshot alpha
+#50      23      *       *       *       rsnapshot beta
diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc
diff --git a/root/etc/crontabs/root b/root/etc/crontabs/root
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-crontabs-config
diff --git a/...config/dependencies.d/init-rsnapshot-test → ...ig-end/dependencies.d/init-rsnapshot-test b/...config/dependencies.d/init-rsnapshot-test → ...ig-end/dependencies.d/init-rsnapshot-test
diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/type
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
diff --git a/root/etc/s6-overlay/s6-rc.d/init-rsnapshot-config/run b/root/etc/s6-overlay/s6-rc.d/init-rsnapshot-config/run
@@ -14,6 +14,7 @@ sed -i -E 's@^#cmd_ssh	/usr/bin/ssh$@cmd_ssh	/usr/bin/ssh@g' /etc/rsnapshot.conf
 sed -i -E 's@^#cmd_du		/usr/bin/du$@cmd_du		/usr/bin/du@g' /etc/rsnapshot.conf.default
 sed -i -E 's@^#cmd_rsnapshot_diff	/usr/local/bin/rsnapshot-diff$@cmd_rsnapshot_diff	/usr/bin/rsnapshot-diff@g' /etc/rsnapshot.conf.default
 sed -i -E 's@^#logfile	/var/log/rsnapshot$@logfile	/config/rsnapshot.log@g' /etc/rsnapshot.conf.default
+sed -i -E 's@^lockfile	/var/run/rsnapshot.pid$@lockfile	/config/rsnapshot.pid@g' /etc/rsnapshot.conf.default
 sed -i -E 's@^#link_dest	0$@link_dest	1@g' /etc/rsnapshot.conf.default
 sed -i -E 's@^backup	/home/		localhost/$@backup	/data/		localhost/\n#backup	/home/		localhost/@g' /etc/rsnapshot.conf.default
 sed -i -E 's@^backup	/etc/		localhost/$@#backup	/etc/		localhost/@g' /etc/rsnapshot.conf.default

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
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/type b/root/etc/s6-overlay/s6-rc.d/svc-cron/type
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-crontabs-config
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