From 5a37ac37dfe2eb13bed1cc7f644b5d46bfc5e90b Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:58:41 +0200
Subject: [PATCH] Run maintenance task through a dedicated process (#105)

---
 rootfs/etc/cont-init.d/03-config.sh                |  7 +++++++
 .../{07-svc-weathermap.sh => 07-svc-cron.sh}       | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 rename rootfs/etc/cont-init.d/{07-svc-weathermap.sh => 07-svc-cron.sh} (66%)

diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 67d2d97..be9b960 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -179,6 +179,13 @@ if [ ! -z "${RRDCACHED_HOST}" ]; then
 EOL
 fi
 
+# Config : Dispatcher
+cat > ${LIBRENMS_PATH}/config.d/dispatcher.php <<EOL
+<?php
+\$config['service_update_enabled'] = false;
+\$config['service_watchdog_enabled'] = false;
+EOL
+
 # Fix perms
 echo "Fixing perms..."
 chown librenms. /data/config /data/monitoring-plugins /data/rrd /data/weathermap
diff --git a/rootfs/etc/cont-init.d/07-svc-weathermap.sh b/rootfs/etc/cont-init.d/07-svc-cron.sh
similarity index 66%
rename from rootfs/etc/cont-init.d/07-svc-weathermap.sh
rename to rootfs/etc/cont-init.d/07-svc-cron.sh
index 121deaf..a05fbe4 100644
--- a/rootfs/etc/cont-init.d/07-svc-weathermap.sh
+++ b/rootfs/etc/cont-init.d/07-svc-cron.sh
@@ -4,11 +4,12 @@ CRONTAB_PATH="/var/spool/cron/crontabs"
 
 LIBRENMS_WEATHERMAP=${LIBRENMS_WEATHERMAP:-false}
 LIBRENMS_WEATHERMAP_SCHEDULE=${LIBRENMS_WEATHERMAP_SCHEDULE:-*/5 * * * *}
+LIBRENMS_DAILY_SCHEDULE="15 0 * * *"
 
 SIDECAR_DISPATCHER=${SIDECAR_DISPATCHER:-0}
 SIDECAR_SYSLOGNG=${SIDECAR_SYSLOGNG:-0}
 
-if [ "$SIDECAR_DISPATCHER" = "1" ] || [ "$SIDECAR_SYSLOGNG" = "1" ] || [ "$LIBRENMS_WEATHERMAP" != "true" ]; then
+if [ "$SIDECAR_DISPATCHER" = "1" ] || [ "$SIDECAR_SYSLOGNG" = "1" ]; then
   exit 0
 fi
 
@@ -18,7 +19,10 @@ mkdir -m 0644 -p ${CRONTAB_PATH}
 touch ${CRONTAB_PATH}/librenms
 
 # Cron
-if [ -n "$LIBRENMS_WEATHERMAP_SCHEDULE" ]; then
+echo "Creating LibreNMS daily.sh cron task with the following period fields: $LIBRENMS_DAILY_SCHEDULE"
+echo "${LIBRENMS_DAILY_SCHEDULE} cd /opt/librenms/ && bash daily.sh" >> ${CRONTAB_PATH}/librenms
+
+if [ "$LIBRENMS_WEATHERMAP" = "true" ] && [ -n "$LIBRENMS_WEATHERMAP_SCHEDULE" ]; then
   echo "Creating LibreNMS Weathermap cron task with the following period fields: $LIBRENMS_WEATHERMAP_SCHEDULE"
   echo "${LIBRENMS_WEATHERMAP_SCHEDULE} php -f /opt/librenms/html/plugins/Weathermap/map-poller.php" >> ${CRONTAB_PATH}/librenms
 fi
@@ -28,10 +32,10 @@ echo "Fixing crontabs permissions..."
 chmod -R 0644 ${CRONTAB_PATH}
 
 # Create service
-mkdir -p /etc/services.d/weathermap
-cat > /etc/services.d/weathermap/run <<EOL
+mkdir -p /etc/services.d/cron
+cat > /etc/services.d/cron/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 exec busybox crond -f -L /dev/stdout
 EOL
-chmod +x /etc/services.d/weathermap/run
+chmod +x /etc/services.d/cron/run