Merge branch 'master' of github.com:maxbeth/fail2ban

2015-07-07 21:58:51 +02:00 · 2015-07-07 21:58:51 +02:00 · d412b71f3a
parent c213d97d25 6d72602f6b
commit d412b71f3a
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -71,6 +71,7 @@ kojiro
 Lars Kneschke
 Lee Clemens
 leftyfb (Mike Rushton)
+M. Maraun
 Manuel Arostegui Ramirez
 Marcel Dopita
 Mark Edgington
--- a/config/action.d/badips.py
+++ b/config/action.d/badips.py
@ -117,7 +117,7 @@ class BadIPsAction(ActionBase):
 		"""
 		try:
 			response = urlopen(
-				self._Request("/".join([self._badips, "get", "categories"])))
+				self._Request("/".join([self._badips, "get", "categories"])), None, 3)
 		except HTTPError as response:
 			messages = json.loads(response.read().decode('utf-8'))
 			self._logSys.error(