From 86cecb0fa4bf2247ab53f137deb396f7c32848d3 Mon Sep 17 00:00:00 2001 From: Anthony OGIER Date: Fri, 21 Sep 2018 12:38:43 +0200 Subject: [PATCH 1/3] Add Lufi's cron jobs --- Dockerfile | 2 ++ cron_script | 15 +++++++++++++++ startup | 3 +++ 3 files changed, 20 insertions(+) create mode 100755 cron_script diff --git a/Dockerfile b/Dockerfile index 8b3b98f..f62dfb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,5 +52,7 @@ EXPOSE 8081 ADD startup /usr/local/bin/startup ADD lufi.conf /usr/lufi/lufi.conf RUN chmod +x /usr/local/bin/startup +ADD cron_script /etc/periodic/hourly/cron_script +RUN chmod 755 /etc/periodic/hourly/cron_script CMD ["/usr/local/bin/startup"] diff --git a/cron_script b/cron_script new file mode 100755 index 0000000..bf3a4d8 --- /dev/null +++ b/cron_script @@ -0,0 +1,15 @@ +#!/bin/sh + +# Executing Lufi's cron jobs following the official documentation https://framagit.org/luc/lufi/wikis/cron-jobs + +cd /usr/lufi + +# Delete IP adresses from database +su lufi -c "carton exec script/lufi cron cleanbdd --mode production" + +# Delete expired files +su lufi -c "carton exec script/lufi cron cleanfiles --mode production" + +# Watch the size of the files directory +su lufi -c "carton exec script/lufi watch cleanfiles --mode production" + diff --git a/startup b/startup index 62ec5f4..0d52fde 100644 --- a/startup +++ b/startup @@ -20,5 +20,8 @@ if [ -e /themes ]; then done fi +# Launch cron with a verbosity level at 2 ("Most verbose:0, default:8" according crond -h) +crond -l 2 -d 2 + cd /usr/lufi exec su-exec lufi:lufi /sbin/tini -- /usr/local/bin/carton exec hypnotoad -f /usr/lufi/script/lufi From 00df65a81ed1475932c84bad946502cd1d8ec83b Mon Sep 17 00:00:00 2001 From: Anthony OGIER Date: Fri, 21 Sep 2018 16:19:25 +0200 Subject: [PATCH 2/3] Fix the cron watch call name --- cron_script | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cron_script b/cron_script index bf3a4d8..ccb7935 100755 --- a/cron_script +++ b/cron_script @@ -1,7 +1,6 @@ #!/bin/sh # Executing Lufi's cron jobs following the official documentation https://framagit.org/luc/lufi/wikis/cron-jobs - cd /usr/lufi # Delete IP adresses from database @@ -11,5 +10,5 @@ su lufi -c "carton exec script/lufi cron cleanbdd --mode production" su lufi -c "carton exec script/lufi cron cleanfiles --mode production" # Watch the size of the files directory -su lufi -c "carton exec script/lufi watch cleanfiles --mode production" +su lufi -c "carton exec script/lufi cron watch --mode production" From fe7269af452de117a0d25d75856d3353da1cdce0 Mon Sep 17 00:00:00 2001 From: Anthony OGIER Date: Fri, 21 Sep 2018 16:20:00 +0200 Subject: [PATCH 3/3] Add logs for crond at /var/log/crond.log --- startup | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/startup b/startup index 0d52fde..833f842 100644 --- a/startup +++ b/startup @@ -20,8 +20,7 @@ if [ -e /themes ]; then done fi -# Launch cron with a verbosity level at 2 ("Most verbose:0, default:8" according crond -h) -crond -l 2 -d 2 +crond -L /var/log/crond.log cd /usr/lufi exec su-exec lufi:lufi /sbin/tini -- /usr/local/bin/carton exec hypnotoad -f /usr/lufi/script/lufi