adblock: update 3.4.3

* add pidfile writing / check to prevent further race conditions
* ease the download utility selection: uclient-fetch (default),
  wget, curl, aria2c, wget-nossl, busybox-wget are pre-configured
* add debug download logging in case of an error, e.g. wrong url
* change 'malware' blocklist source url
* add logfile information to email template
* LuCI: add 'Download Utility' select box
* LuCI: add new "running" status

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2018-01-10 19:33:42 +01:00
parent 35234924cb
commit c3098f69d0
6 changed files with 125 additions and 103 deletions

View File

@@ -10,7 +10,7 @@
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
mail_ver="1.0.0"
mail_ver="1.0.1"
mail_daemon="$(command -v msmtp)"
mail_profile="adb_notify"
mail_debug="--debug"
@@ -21,6 +21,13 @@ then
mail_daemon="$(command -v sendmail)"
fi
if [ -f "/var/log/messages" ]
then
logfile="$(cat /var/log/messages | grep "adblock-")"
else
logfile="$(logread -e "adblock-")"
fi
# mail header
#
mail_sender="no-reply@adblock"
@@ -33,6 +40,7 @@ mail_head="From: ${mail_sender}\nTo: ${mail_receiver}\nSubject: ${mail_topic}\nR
mail_text="adblock status, generated at $(date 2>&1)!"
mail_text="${mail_text}\n++\n++ System Information ++\n++\n$(cat /etc/banner 2>&1)"
mail_text="${mail_text}\n\n++\n++ Adblock Information ++\n++\n$(/etc/init.d/adblock status 2>&1)"
mail_text="${mail_text}\n\n++\n++ Logfile Information ++\n++\n${logfile}\n++\n++\n"
# send mail
#