Merge branch 'devel'

e-badips

@@ -9,5 +9,5 @@ trap "/bin/rm -f ${tmp}" EXIT SIGHUP SIGINT SIGTERM
 
 curl -f -s -S -m 60 -o $tmp "https://www.badips.com/get/list/${banservice}/${banlevel}?age=${rangecheck}"
 while read -r ip ; do
-    ipset -! add ${banset} ${ip} timeout $bantime
+    ipset -! add ${banset} ${ip} timeout $banttl
 done < $tmp

e-pullasn

@@ -13,5 +13,5 @@ while read -r asn ; do
 done < $CONFD/WHITE.asn
 
 grep -Eo "([0-9.]+){4}/[0-9]+" $tmp | while read -r net ; do
-    ipset -! add  $whiteset $net timeout $routettl
+    ipset -! add  $whiteset $net timeout $whitettl
 done

e-router

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 ((EUID == 0 )) || { echo "Need root"; exit 1; }
 set -euo pipefail
 CONFD=/etc/e-router