wip #5590 @0.5

diff --git a/.docker/config/cron/crontab b/.docker/config/cron/crontab
new file mode 100644 (file)
index 0000000..4acd6f4
--- /dev/null
+++ b/.docker/config/cron/crontab
@@ -0,0 +1,6 @@
+MAILTO=sysadmin@cubedesigners.com
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+* * * * *   runuser -l toolbox -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2
+20 5 * * *  /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2

diff --git a/.docker/config/cron/host b/.docker/config/cron/host
new file mode 100644 (file)
index 0000000..979810b
--- /dev/null
+++ b/.docker/config/cron/host
@@ -0,0 +1 @@
+3 4 * * *   root    /docker/fluidbook-toolbox/build  >/dev/null 2>/dev/null

diff --git a/.docker/config/crontab b/.docker/config/crontab
deleted file mode 100644 (file)
index 4acd6f4..0000000
--- a/.docker/config/crontab
+++ /dev/null
@@ -1,6 +0,0 @@
-MAILTO=sysadmin@cubedesigners.com
-SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-* * * * *   runuser -l toolbox -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2
-20 5 * * *  /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index b97be5bebc6fb38ec0c1366079ef8fb85ea069e4..041cd60146fb5b9e91cd72cf6c229b8196cfa86f 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - '/home/toolbox/www:/application'
       - '/home/toolbox/www/storage/app/public/:/application/public/storage/'
       - '/home/toolbox/www/.docker/config/php.ini:/etc/php/8.1/fpm/conf.d/99-overrides.ini'
-      - '/home/toolbox/www/.docker/config/crontab:/etc/crontab'
+      - '/home/toolbox/www/.docker/config/cron/crontab:/etc/crontab'
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/data/extranet/www/fluidbook/docs/'
       - '/home/extranet:/home/extranet'
       - '/data/extranet:/data/extranet'

diff --git a/.docker/update b/.docker/update
index 1d12ecbe6d97c6a52c28c69a4172923909cd7d76..65004891b176ca6f210d3c0c5bc97bdadb173caa 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -1,5 +1,6 @@
 #!/bin/sh
 cd /docker/fluidbook-toolbox
+chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox
 docker network create fluidbook-toolbox
 docker compose down
 docker compose up -d