CERBERUS/fail2ban
1
0
Fork 0
mirror of https://github.com/fail2ban/fail2ban.git synced 2026-09-21 15:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

non-static (get|set)BaseDir for Configurator. fixes #160

Browse source 
ConfigReader's (get|set)BaseDir are no longer static as a result of
.d/ support RFing
This commit is contained in:
Yaroslav Halchenko 2013-03-27 11:51:07 -04:00
parent 72b06479a5
commit f643e2e907
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/configurator.py
View file

@ -43,15 +43,19 @@ class Configurator:
self.__fail2ban = Fail2banReader()
self.__jails = JailsReader()
#@staticmethod
def setBaseDir(folderName):
ConfigReader.setBaseDir(folderName)
setBaseDir = staticmethod(setBaseDir)
def setBaseDir(self, folderName):
self.__fail2ban.setBaseDir(folderName)
self.__jails.setBaseDir(folderName)
#@staticmethod
def getBaseDir():
return ConfigReader.getBaseDir()
getBaseDir = staticmethod(getBaseDir)
def getBaseDir(self):
fail2ban_basedir = self.__fail2ban.getBaseDir()
jails_basedir = self.__jails.getBaseDir()
if fail2ban_basedir != jails_basedir:
logSys.error("fail2ban.conf and jails.conf readers have differing "
"basedirs: %r and %r. "
"Returning the one for fail2ban.conf"
% (fail2ban_basedir, jails_basedir))
return fail2ban_basedir
def readEarly(self):
self.__fail2ban.read()