From: <los...@us...> - 2008-08-12 22:05:08
|
Revision: 711 http://fail2ban.svn.sourceforge.net/fail2ban/?rev=711&view=rev Author: lostcontrol Date: 2008-08-12 22:05:13 +0000 (Tue, 12 Aug 2008) Log Message: ----------- - Removed "timeregex" and "timepattern" stuff that is not needed anymore. Modified Paths: -------------- branches/FAIL2BAN-0_8/client/filterreader.py branches/FAIL2BAN-0_8/common/protocol.py Modified: branches/FAIL2BAN-0_8/client/filterreader.py =================================================================== --- branches/FAIL2BAN-0_8/client/filterreader.py 2008-08-12 21:42:21 UTC (rev 710) +++ branches/FAIL2BAN-0_8/client/filterreader.py 2008-08-12 22:05:13 UTC (rev 711) @@ -53,20 +53,14 @@ return ConfigReader.read(self, "filter.d/" + self.__file) def getOptions(self, pOpts): - opts = [["string", "timeregex", None], - ["string", "timepattern", None], - ["string", "ignoreregex", ""], + opts = [["string", "ignoreregex", ""], ["string", "failregex", ""]] self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts) def convert(self): stream = list() for opt in self.__opts: - if opt == "timeregex": - stream.append(["set", self.__name, "timeregex", self.__opts[opt]]) - elif opt == "timepattern": - stream.append(["set", self.__name, "timepattern", self.__opts[opt]]) - elif opt == "failregex": + if opt == "failregex": for regex in self.__opts[opt].split('\n'): # Do not send a command if the rule is empty. if regex != '': Modified: branches/FAIL2BAN-0_8/common/protocol.py =================================================================== --- branches/FAIL2BAN-0_8/common/protocol.py 2008-08-12 21:42:21 UTC (rev 710) +++ branches/FAIL2BAN-0_8/common/protocol.py 2008-08-12 22:05:13 UTC (rev 711) @@ -72,8 +72,6 @@ ['', "JAIL INFORMATION", ""], ["get <JAIL> logpath", "gets the list of the monitored files for <JAIL>"], ["get <JAIL> ignoreip", "gets the list of ignored IP addresses for <JAIL>"], -["get <JAIL> timeregex", "gets the regular expression used for the time detection for <JAIL>"], -["get <JAIL> timepattern", "gets the pattern used for the time detection for <JAIL>"], ["get <JAIL> failregex", "gets the list of regular expressions which matches the failures for <JAIL>"], ["get <JAIL> ignoreregex", "gets the list of regular expressions which matches patterns to ignore for <JAIL>"], ["get <JAIL> findtime", "gets the time for which the filter will look back for failures for <JAIL>"], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |