BF: Fix dbpurgeage default value, and change default dbfile extension

pull/480/head
Steven Hiscocks 2013-12-08 11:35:12 +00:00
parent d6fe80ba50
commit d8c7bca9b0
3 changed files with 6 additions and 5 deletions

View File

@ -51,8 +51,8 @@ pidfile = /var/run/fail2ban/fail2ban.pid
# Notes.: Set the file for the fail2ban persistent data to be stored.
# A value of :memory: means database is only stored in memory, and
# data is lost once fail2ban is stops.
# Values: [ FILE ] :memory: Default: /var/lib/fail2ban/fail2ban.db
dbfile = /var/lib/fail2ban/fail2ban.db
# Values: [ FILE ] :memory: Default: /var/lib/fail2ban/fail2ban.sqlite3
dbfile = /var/lib/fail2ban/fail2ban.sqlite3
# Options: dbpurgeage
# Notes.: Sets age at which bans should be purged from the database

View File

@ -46,8 +46,8 @@ class Fail2banReader(ConfigReader):
def getOptions(self):
opts = [["int", "loglevel", 1],
["string", "logtarget", "STDERR"],
["string", "dbfile", "/var/lib/fail2ban/fail2ban.db"],
["int", "dbpurgeage", "/var/lib/fail2ban/fail2ban.db"]]
["string", "dbfile", "/var/lib/fail2ban/fail2ban.sqlite3"],
["int", "dbpurgeage", 86400]]
self.__opts = ConfigReader.getOptions(self, "Definition", opts)
def convert(self):

View File

@ -360,7 +360,8 @@ class JailsReaderTest(unittest.TestCase):
# and there is logging information left to be passed into the
# server
self.assertEqual(sorted(commands),
[['set', 'dbfile', '/var/lib/fail2ban/fail2ban.db'],
[['set', 'dbfile',
'/var/lib/fail2ban/fail2ban.sqlite3'],
['set', 'dbpurgeage', 86400],
['set', 'loglevel', 3],
['set', 'logtarget', '/var/log/fail2ban.log']])