From 2516b309d9322f33272a85ffb47d084cc4168d92 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 13 Aug 2022 02:10:41 +0200 Subject: [PATCH] Remove Weathermap plugin while waiting for a fix upstream (#302) Co-authored-by: CrazyMax --- rootfs/etc/cont-init.d/03-config.sh | 4 ++++ rootfs/etc/cont-init.d/07-svc-cron.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh index aa30aa7..de0d3ba 100644 --- a/rootfs/etc/cont-init.d/03-config.sh +++ b/rootfs/etc/cont-init.d/03-config.sh @@ -103,6 +103,10 @@ if [ -L "/data/weathermap/weathermap" ]; then rm /data/weathermap/weathermap fi +# FIXME: bring back when weathermap plugin compatible with PHP 8 +# https://github.com/librenms/docker/issues/296 +rm -rf ${LIBRENMS_PATH}/html/plugins/Weathermap + touch /data/logs/librenms.log rm -rf ${LIBRENMS_PATH}/logs rm -f ${LIBRENMS_PATH}/config.d/* diff --git a/rootfs/etc/cont-init.d/07-svc-cron.sh b/rootfs/etc/cont-init.d/07-svc-cron.sh index dd9269c..6d302ad 100644 --- a/rootfs/etc/cont-init.d/07-svc-cron.sh +++ b/rootfs/etc/cont-init.d/07-svc-cron.sh @@ -16,6 +16,9 @@ if [ "$SIDECAR_DISPATCHER" = "1" ] || [ "$SIDECAR_SYSLOGNG" = "1" ] || [ "$SIDEC exit 0 fi +# FIXME: remove this line when weathermap plugin compatible with PHP 8 +LIBRENMS_WEATHERMAP=false + # Init rm -rf ${CRONTAB_PATH} mkdir -m 0644 -p ${CRONTAB_PATH}