Source plugin ini diverged from py defaults.

This commit is contained in:
Stefan Hacker
2013-02-26 23:56:34 +01:00
parent 0efae58454
commit e02206b022
2 changed files with 5 additions and 8 deletions

View File

@@ -46,9 +46,7 @@ teams = Lobby, Spectator, Team one, Team two, Team three, Team four
; When creating a channel setup ACLs to restrict it to players
restrict = true
; Create base/server-channels on-demand
createifmissing = true
; Delete channels as soon as the last player is gone
; Delete server channels as soon as the last player is gone
deleteifunused = true
; Regular expression for server restriction.

View File

@@ -50,18 +50,17 @@ class source(MumoModule):
('name', str, "%(game)s"),
('servername', str, "%(server)s"),
('teams', commaSeperatedStrings, ["Lobby", "Spectator", "Team one", "Team two", "Team three", "Team four"]),
('groups', commaSeperatedStrings, ["%(game)s", "%(game)s_%(team)s", "%(game)s_%(team)s_%(channelid)d"]),
('restrict', x2bool, True),
('serverregex', re.compile, re.compile("^\[[\w\d\-\(\):]{1,20}\]$")),
('createifmissing', x2bool, True),
('deleteifunused', x2bool, True)
)
default_config = {'source':(
('database', str, "source.sqlite"),
('basechannelid', int, 0),
('servers', commaSeperatedIntegers, []),
('gameregex', re.compile, re.compile("^(tf|dod|cstrike)$"))
('mumbleservers', commaSeperatedIntegers, []),
('gameregex', re.compile, re.compile("^(tf|dod|cstrike)$")),
('groupprefix', str, "source_")
),
# The generic section defines default values which can be overridden in
@@ -93,7 +92,7 @@ class source(MumoModule):
self.meta = manager.getMeta()
servers = set(cfg.source.servers)
servers = set(cfg.source.mumbleservers)
if not servers:
servers = manager.SERVERS_ALL