Merge branch 'devel'

e-badips

@@ -11,3 +11,8 @@ curl -f -s -S -m 60 -o $tmp "https://www.badips.com/get/list/${banservice}/${ban
 while read -r ip ; do
     ipset -! add ${banset} ${ip} timeout $banttl
 done < $tmp
+
+curl -f -s -S -m 60 -o $tmp  "http://api.blocklist.de/getlast.php?time=3600&service=all"
+while read -r ip ; do
+    ipset -! add ${banset} ${ip} timeout $banttl
+done < $tmp

e-pullasn.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Update goodips ipset  from whois.radb.net
-Requires=iptables.service e-router.service
-After=iptables.service e-router.service
+Requires=e-router.service network-online.target
+After=e-router.service  network-online.target
 
 [Service]
 Type=oneshot

e-pullasn.timer

@@ -3,7 +3,7 @@ Description=e-pullasn timer
 
 [Timer]
 OnUnitActiveSec=42000
-OnBootSec=300
+OnBootSec=15
 
 [Install]
 WantedBy=timers.target