summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2024-01-07 18:10:49 +0100
committerDirk Brenken <dev@brenken.org>2024-01-07 18:11:10 +0100
commit6c9cd775962a3165b70ab7722ba1c6a98b3b5f15 (patch)
tree6cee26c1f9989c63201a97fbe1783fda97396879
parentecff04723107e227a6b512b7b1e9b0209ed89427 (diff)
banip: update 0.9.3-4
* made the default mail template "responsive" to get a better view esp. on mobile devices Signed-off-by: Dirk Brenken <dev@brenken.org>
-rw-r--r--net/banip/Makefile4
-rw-r--r--net/banip/files/banip.tpl8
2 files changed, 6 insertions, 6 deletions
diff --git a/net/banip/Makefile b/net/banip/Makefile
index ca01ea048..d9b58c527 100644
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -1,12 +1,12 @@
# banIP - ban incoming and outgoing IPs via named nftables Sets
-# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk
PKG_NAME:=banip
PKG_VERSION:=0.9.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/banip/files/banip.tpl b/net/banip/files/banip.tpl
index 2b3c20ff2..924ffe0b6 100644
--- a/net/banip/files/banip.tpl
+++ b/net/banip/files/banip.tpl
@@ -1,5 +1,5 @@
# banIP mail template/include - ban incoming and outgoing IPs via named nftables Sets
-# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# info preparation
@@ -12,9 +12,9 @@ elif printf "%s" "${ban_packages}" | "${ban_grepcmd}" -q '"logd'; then
logread_cmd="${ban_logreadcmd} -l ${ban_loglimit} -e "banIP/" 2>/dev/null"
fi
-banip_info="$(/etc/init.d/banip status 2>/dev/null | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
+banip_info="$(/etc/init.d/banip status 2>/dev/null)"
report_info="$("${ban_catcmd}" "${ban_reportdir}/ban_report.txt" 2>/dev/null)"
-log_info="$(${logread_cmd} | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
+log_info="$(${logread_cmd})"
system_info="$(
strings /etc/banner 2>/dev/null
"${ban_ubuscmd}" call system board | "${ban_awkcmd}" 'BEGIN{FS="[{}\"]"}{if($2=="kernel"||$2=="hostname"||$2=="system"||$2=="model"||$2=="description")printf " + %-12s: %s\n",$2,$4}'
@@ -22,7 +22,7 @@ system_info="$(
# content header
#
-mail_text="$(printf "%s\n" "<html><body><pre style='display:block;font-family:monospace;font-size:1rem;padding:20;background-color:#f3eee5;white-space:pre'>")"
+mail_text="$(printf "%s\n" "<html><body><pre style='font-family:monospace;padding:20;background-color:#f3eee5;white-space:pre-wrap;overflow-x:auto;' >")"
# content body
#