diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-01-28 14:09:30 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-01-28 14:09:30 -0200 |
| commit | afade3b215bc5c10fdbf30a5d8b6d97e87302aaa (patch) | |
| tree | a25deb96cf1616cda6278929a5408e31edf428e7 /files/qwebirc-ssl.patch.orig | |
| download | puppet-qwebirc-afade3b215bc5c10fdbf30a5d8b6d97e87302aaa.tar.gz puppet-qwebirc-afade3b215bc5c10fdbf30a5d8b6d97e87302aaa.tar.bz2 | |
Initial import
Diffstat (limited to 'files/qwebirc-ssl.patch.orig')
| -rw-r--r-- | files/qwebirc-ssl.patch.orig | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/files/qwebirc-ssl.patch.orig b/files/qwebirc-ssl.patch.orig new file mode 100644 index 0000000..f0626f9 --- /dev/null +++ b/files/qwebirc-ssl.patch.orig @@ -0,0 +1,38 @@ +diff -r 19d6068a1aa6 config.py.example +--- a/config.py.example Sun Apr 03 23:58:29 2011 +0100 ++++ b/config.py.example Wed Oct 12 17:43:46 2011 -0400 +@@ -19,6 +19,11 @@ + # OPTION: IRCPORT + # Port of IRC server to connect to. + IRCSERVER, IRCPORT = "irc.myserver.com", 6667 ++ ++# OPTION: SSLPORT ++# SSL port of IRC server to connect to. ++# If this option is uncommented it will override IRCPORT. ++#SSLPORT = 6697 + + # OPTION: REALNAME + # The realname field of IRC clients will be set to this value. +diff -r 19d6068a1aa6 qwebirc/ircclient.py +--- a/qwebirc/ircclient.py Sun Apr 03 23:58:29 2011 +0100 ++++ b/qwebirc/ircclient.py Wed Oct 12 17:43:46 2011 -0400 +@@ -1,6 +1,6 @@ + import twisted, sys, codecs, traceback + from twisted.words.protocols import irc +-from twisted.internet import reactor, protocol, abstract ++from twisted.internet import reactor, protocol, abstract, ssl + from twisted.web import resource, server + from twisted.protocols import basic + from twisted.names.client import Resolver +@@ -152,7 +152,10 @@ + tcpkwargs["bindAddress"] = (config.OUTGOING_IP, 0) + + if CONNECTION_RESOLVER is None: +- reactor.connectTCP(config.IRCSERVER, config.IRCPORT, f, **tcpkwargs) ++ if hasattr(config, "SSLPORT"): ++ reactor.connectSSL(config.IRCSERVER, config.SSLPORT, f, ssl.ClientContextFactory(), **tcpkwargs) ++ else: ++ reactor.connectTCP(config.IRCSERVER, config.IRCPORT, f, **tcpkwargs) + return f + + def callback(result): |