Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

Add protocols.irc.certfile

Browse Source 
Fixes #612.
This commit is contained in:
nyuszika7h 2014-06-04 18:58:43 +02:00
parent 7d716aa8f3
commit fa06f2af34
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf.py
View File

@ -1064,6 +1064,10 @@ registerGlobalValue(supybot.protocols.irc, 'strictRfc',
a nick such as services@this.network.server then you you should set this to a nick such as services@this.network.server then you you should set this to
False."""))) False.""")))
registerGlobalValue(supybot.protocols.irc, 'certfile',
registry.String('', _("""Determines what certificate file (if any) the bot
will use connect with SSL sockets by default.""")))
registerGlobalValue(supybot.protocols.irc, 'umodes', registerGlobalValue(supybot.protocols.irc, 'umodes',
registry.String('', _("""Determines what user modes the bot will request registry.String('', _("""Determines what user modes the bot will request
from the server when it first connects. Many people might choose +i; some from the server when it first connects. Many people might choose +i; some

2
src/drivers/Socket.py
View File

@ -307,6 +307,8 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
assert 'ssl' in globals() assert 'ssl' in globals()
certfile = getattr(conf.supybot.networks, self.irc.network) \ certfile = getattr(conf.supybot.networks, self.irc.network) \
.certfile() .certfile()
if not certfile:
certfile = conf.supybot.protocols.irc.certfile()
if not certfile: if not certfile:
certfile = None certfile = None
elif not os.path.isfile(certfile): elif not os.path.isfile(certfile):