Merge branch 'standard-cron' into standard-cron-develop

linuxserver · Aug 26, 2023 · 74f9122 · 74f9122
2 parents d935187 + e25b4e3
commit 74f9122
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 35 deletions.
diff --git a/root/etc/crontabs/abc b/root/etc/crontabs/abc
@@ -0,0 +1,2 @@
+# min   hour    day     month   weekday command
+*/5     *       *       *       *       /usr/bin/php /app/www/public/cron.php 2>&1
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/...nfig/dependencies.d/init-nextcloud-config → ...-end/dependencies.d/init-nextcloud-config b/...nfig/dependencies.d/init-nextcloud-config → ...-end/dependencies.d/init-nextcloud-config
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-nextcloud-config/run b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
@@ -21,7 +21,6 @@ if [ -f /config/www/nextcloud/version.php ]; then
         ! -path "/config/www/nextcloud/config" \
         ! -path "/config/www/nextcloud/themes" \
         -delete
-    sed -i "s|/config/www/nextcloud/cron.php|/app/www/public/cron.php|g" /config/crontabs/root
     touch /config/www/nextcloud/config/needs_migration
 fi
 

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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# min hour day month weekday command
		/5 * * * /usr/bin/php /app/www/public/cron.php 2>&1