diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-04-19 10:46:46 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-04-19 10:46:46 -0300 |
| commit | abbf32872b917f8155bd6298d8f8d4315e85f82d (patch) | |
| tree | ff8df45bf9b11b862d602d27850ee04d7ae40418 /files/qwebirc-ssl.patch | |
| parent | 056838d484ed26523abc00f96e8ee59132e392bb (diff) | |
| download | puppet-qwebirc-abbf32872b917f8155bd6298d8f8d4315e85f82d.tar.gz puppet-qwebirc-abbf32872b917f8155bd6298d8f8d4315e85f82d.tar.bz2 | |
Cleaning ssl patch dependencies
Diffstat (limited to 'files/qwebirc-ssl.patch')
| -rw-r--r-- | files/qwebirc-ssl.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/files/qwebirc-ssl.patch b/files/qwebirc-ssl.patch deleted file mode 100644 index 9c9e921..0000000 --- a/files/qwebirc-ssl.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -r 19d6068a1aa6 config.py.example ---- a/config.py.example Sun Apr 03 23:58:29 2011 +0100 -+++ b/config.py.example Sat Jan 28 13:31:49 2012 -0200 -@@ -20,6 +20,11 @@ - # 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. - REALNAME = "http://moo.com/" -diff -r 19d6068a1aa6 qwebirc/ircclient.py ---- a/qwebirc/ircclient.py Sun Apr 03 23:58:29 2011 +0100 -+++ b/qwebirc/ircclient.py Sat Jan 28 13:31:49 2012 -0200 -@@ -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): |