From fc8493ad8aa098580fdf82131f8d068ba4516e00 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sat, 17 May 2014 09:31:56 +0200 Subject: [PATCH 1/4] supybot-wizard: Ask SSL after port and don't say it needs Twisted --- scripts/supybot-wizard | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 22af37b2e..25c09e08c 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -405,6 +405,13 @@ def main(): server = ':'.join([serverString, str(port)]) network.servers.setValue([server]) + if advanced: + # conf.supybot.networks..ssl + output("""Some servers allow you to use a secure connection via SSL. + This requires having pyOpenSSL installed.""") + if yn('Do you want to use an SSL connection?', default=False): + network.ssl.setValue(True) + # conf.supybot.nick # Force the user into specifying a nick if it didn't have one already while True: @@ -447,15 +454,6 @@ def main(): else: conf.supybot.ident.set(defaultIdent) - if advanced: - # conf.supybot.networks..ssl - output("""Some servers allow you to use a secure connection via SSL. - This requires having pyOpenSSL installed. Currently, you also need - Twisted installed as only the Twisted drivers supports SSL - connections.""") - if yn('Do you want to use an SSL connection?', default=False): - network.ssl.setValue(True) - # conf.supybot.networks..password output("""Some servers require a password to connect to them. Most public servers don't. If you try to connect to a server and for some From 5a1398893d4aa704bd527d0851618de285177985 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sat, 17 May 2014 09:33:40 +0200 Subject: [PATCH 2/4] supybot-wizard: Use chat. instead of irc.freenode.net --- scripts/supybot-wizard | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 25c09e08c..8e8e4cf93 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -351,8 +351,9 @@ def main(): while not network: output("""First, we need to know the name of the network you'd like to connect to. Not the server host, mind you, but the name of the - network. If you plan to connect to irc.freenode.net, for instance, you - should answer this question with 'freenode' (without the quotes).""") + network. If you plan to connect to chat.freenode.net, for instance, + you should answer this question with 'freenode' (without the quotes). + """) network = something('What IRC network will you be connecting to?') if '.' in network: output("""There shouldn't be a '.' in the network name. Remember, From b5636860bf5fedb80509c2aac6b841133f5fac33 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sat, 17 May 2014 12:24:14 +0200 Subject: [PATCH 3/4] supybot-wizard: Default to port 6697 for SSL --- scripts/supybot-wizard | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 8e8e4cf93..b39b4f874 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -386,9 +386,17 @@ def main(): ip = 'no network available' output("""Found %s (%s).""" % (serverString, ip)) - output("""IRC Servers almost always accept connections on port - 6667. They can, however, accept connections anywhere their admins - feel like they wants to accept connections from.""") + + if advanced: + # conf.supybot.networks..ssl + output("""Some servers allow you to use a secure connection via SSL. + This requires having pyOpenSSL installed.""") + if yn('Do you want to use an SSL connection?', default=False): + network.ssl.setValue(True) + + output("""IRC servers almost always accept connections on port + 6667 (or 6697 for SSL). They can, however, accept connections + anywhere their admins feel like they want to accept connections from.""") if yn('Does this server require connection on a non-standard port?', default=False): port = 0 @@ -402,17 +410,13 @@ def main(): output("""That's not a valid port.""") port = 0 else: - port = 6667 + if network.ssl.value: + port = 6697 + else: + port = 6667 server = ':'.join([serverString, str(port)]) network.servers.setValue([server]) - if advanced: - # conf.supybot.networks..ssl - output("""Some servers allow you to use a secure connection via SSL. - This requires having pyOpenSSL installed.""") - if yn('Do you want to use an SSL connection?', default=False): - network.ssl.setValue(True) - # conf.supybot.nick # Force the user into specifying a nick if it didn't have one already while True: From 7b1965f6d7153a88f73bf209f2b592852eeaf246 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sat, 17 May 2014 12:27:56 +0200 Subject: [PATCH 4/4] supybot-wizard: Clarify help text from previous commit [ci skip] --- scripts/supybot-wizard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index b39b4f874..5c8b039a1 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -395,7 +395,7 @@ def main(): network.ssl.setValue(True) output("""IRC servers almost always accept connections on port - 6667 (or 6697 for SSL). They can, however, accept connections + 6667 (or 6697 when using SSL). They can, however, accept connections anywhere their admins feel like they want to accept connections from.""") if yn('Does this server require connection on a non-standard port?', default=False):