From 5ca082b0bf2d744e11e1e75e9da8198a25cac91c Mon Sep 17 00:00:00 2001 From: Jan Larres Date: Wed, 28 Jan 2015 23:47:51 +1300 Subject: [PATCH] weechat: upgrade conf and use plain SASL over SSL --- weechat/alias.conf | 2 +- weechat/aspell.conf | 2 +- weechat/charset.conf | 2 +- weechat/colorize_nicks.conf | 2 +- weechat/exec.conf | 2 +- weechat/irc.conf | 15 +++++++++++---- weechat/logger.conf | 2 +- weechat/plugins.conf | 2 +- weechat/relay.conf | 3 ++- weechat/script.conf | 3 ++- weechat/trigger.conf | 8 ++++---- weechat/urlgrab.conf | 2 +- weechat/weechat.conf | 6 +++++- weechat/xfer.conf | 2 +- 14 files changed, 33 insertions(+), 20 deletions(-) diff --git a/weechat/alias.conf b/weechat/alias.conf index e264ea81..b40a347d 100644 --- a/weechat/alias.conf +++ b/weechat/alias.conf @@ -1,5 +1,5 @@ # -# alias.conf -- weechat v1.0.1 +# alias.conf -- weechat v1.1.1 # [cmd] diff --git a/weechat/aspell.conf b/weechat/aspell.conf index aa0bd00d..0f352411 100644 --- a/weechat/aspell.conf +++ b/weechat/aspell.conf @@ -1,5 +1,5 @@ # -# aspell.conf -- weechat v1.0.1 +# aspell.conf -- weechat v1.1.1 # [color] diff --git a/weechat/charset.conf b/weechat/charset.conf index aadbdaef..c319dd33 100644 --- a/weechat/charset.conf +++ b/weechat/charset.conf @@ -1,5 +1,5 @@ # -# charset.conf -- weechat v1.0.1 +# charset.conf -- weechat v1.1.1 # [default] diff --git a/weechat/colorize_nicks.conf b/weechat/colorize_nicks.conf index e6e25e66..c8e4038e 100644 --- a/weechat/colorize_nicks.conf +++ b/weechat/colorize_nicks.conf @@ -1,5 +1,5 @@ # -# colorize_nicks.conf -- weechat v1.0.1 +# colorize_nicks.conf -- weechat v1.1.1 # [look] diff --git a/weechat/exec.conf b/weechat/exec.conf index 0f713aae..f7f62123 100644 --- a/weechat/exec.conf +++ b/weechat/exec.conf @@ -1,5 +1,5 @@ # -# exec.conf -- weechat v1.0.1 +# exec.conf -- weechat v1.1.1 # [command] diff --git a/weechat/irc.conf b/weechat/irc.conf index 6e9aee34..07f9374f 100644 --- a/weechat/irc.conf +++ b/weechat/irc.conf @@ -1,8 +1,10 @@ # -# irc.conf -- weechat v1.0.1 +# irc.conf -- weechat v1.1.1 # [look] +buffer_open_before_autojoin = on +buffer_open_before_join = off buffer_switch_autojoin = on buffer_switch_join = on color_nicks_in_names = off @@ -58,6 +60,7 @@ smart_filter_join_unmask = 30 smart_filter_mode = "+" smart_filter_nick = on smart_filter_quit = on +temporary_servers = off topic_strip_colors = off [color] @@ -125,7 +128,8 @@ notify = "" password = "" proxy = "" realname = "Jan Larres" -sasl_mechanism = dh-blowfish +sasl_fail = continue +sasl_mechanism = plain sasl_password = "" sasl_timeout = 15 sasl_username = "" @@ -138,10 +142,10 @@ ssl_verify = on username = "jan" [server] -freenode.addresses = "chat.freenode.net/6667" +freenode.addresses = "chat.freenode.net/6697" freenode.proxy freenode.ipv6 -freenode.ssl +freenode.ssl = on freenode.ssl_cert freenode.ssl_priorities freenode.ssl_dhkey_size @@ -153,6 +157,7 @@ freenode.sasl_mechanism freenode.sasl_username = "majutsushi" freenode.sasl_password = "${sec.data.freenode}" freenode.sasl_timeout +freenode.sasl_fail freenode.autoconnect = on freenode.autoreconnect freenode.autoreconnect_delay @@ -189,6 +194,7 @@ mozilla.sasl_mechanism mozilla.sasl_username mozilla.sasl_password mozilla.sasl_timeout +mozilla.sasl_fail mozilla.autoconnect mozilla.autoreconnect mozilla.autoreconnect_delay @@ -225,6 +231,7 @@ esper.sasl_mechanism esper.sasl_username esper.sasl_password esper.sasl_timeout +esper.sasl_fail esper.autoconnect esper.autoreconnect esper.autoreconnect_delay diff --git a/weechat/logger.conf b/weechat/logger.conf index 5fb4d9b6..e3ce6e4b 100644 --- a/weechat/logger.conf +++ b/weechat/logger.conf @@ -1,5 +1,5 @@ # -# logger.conf -- weechat v1.0.1 +# logger.conf -- weechat v1.1.1 # [look] diff --git a/weechat/plugins.conf b/weechat/plugins.conf index 38b06eb2..60cf9002 100644 --- a/weechat/plugins.conf +++ b/weechat/plugins.conf @@ -1,5 +1,5 @@ # -# plugins.conf -- weechat v1.0.1 +# plugins.conf -- weechat v1.1.1 # [var] diff --git a/weechat/relay.conf b/weechat/relay.conf index 019f72e5..f5de3505 100644 --- a/weechat/relay.conf +++ b/weechat/relay.conf @@ -1,5 +1,5 @@ # -# relay.conf -- weechat v1.0.1 +# relay.conf -- weechat v1.1.1 # [look] @@ -26,6 +26,7 @@ ipv6 = on max_clients = 5 password = "" ssl_cert_key = "%h/ssl/relay.pem" +ssl_priorities = "NORMAL:-VERS-SSL3.0" websocket_allowed_origins = "" [irc] diff --git a/weechat/script.conf b/weechat/script.conf index a7ce2449..8351912e 100644 --- a/weechat/script.conf +++ b/weechat/script.conf @@ -1,5 +1,5 @@ # -# script.conf -- weechat v1.0.1 +# script.conf -- weechat v1.1.1 # [look] @@ -46,3 +46,4 @@ cache_expire = 60 dir = "%h/script" hold = "" url = "http://www.weechat.org/files/plugins.xml.gz" +url_force_https = on diff --git a/weechat/trigger.conf b/weechat/trigger.conf index 0fdd9d88..cb55b123 100644 --- a/weechat/trigger.conf +++ b/weechat/trigger.conf @@ -1,5 +1,5 @@ # -# trigger.conf -- weechat v1.0.1 +# trigger.conf -- weechat v1.1.1 # [look] @@ -29,19 +29,19 @@ cmd_pass.command = "" cmd_pass.conditions = "" cmd_pass.enabled = on cmd_pass.hook = modifier -cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==$1$.*+" +cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|/oper +[^ ]+ +|/quote +pass +|/set +[^ ]*password[^ ]* +|/secure +(passphrase|decrypt|set +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}" cmd_pass.return_code = ok msg_auth.arguments = "5000|irc_message_auth" msg_auth.command = "" msg_auth.conditions = "" msg_auth.enabled = on msg_auth.hook = modifier -msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==$1$.*+" +msg_auth.regex = "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==${re:1}${hide:*,${re:+}}" msg_auth.return_code = ok server_pass.arguments = "5000|input_text_display;5000|history_add" server_pass.command = "" server_pass.conditions = "" server_pass.enabled = on server_pass.hook = modifier -server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==$1$.*4$5" +server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==${re:1}${hide:*,${re:4}}${re:5}" server_pass.return_code = ok diff --git a/weechat/urlgrab.conf b/weechat/urlgrab.conf index 77b8b2bd..55514548 100644 --- a/weechat/urlgrab.conf +++ b/weechat/urlgrab.conf @@ -1,5 +1,5 @@ # -# urlgrab.conf -- weechat v1.0.1 +# urlgrab.conf -- weechat v1.1.1 # [color] diff --git a/weechat/weechat.conf b/weechat/weechat.conf index 4d03d27d..b22b8126 100644 --- a/weechat/weechat.conf +++ b/weechat/weechat.conf @@ -1,5 +1,5 @@ # -# weechat.conf -- weechat v1.0.1 +# weechat.conf -- weechat v1.1.1 # [debug] @@ -38,6 +38,7 @@ color_nick_offline = off color_pairs_auto_reset = 5 color_real_white = off command_chars = "" +command_incomplete = off confirm_quit = off day_change = on day_change_message_1date = "-- %a, %d %b %Y --" @@ -67,6 +68,7 @@ input_share_overwrite = off input_undo_max = 32 item_buffer_filter = "*" item_buffer_zoom = "!" +item_mouse_status = "M" item_time_format = "%H:%M" jump_current_to_previous_buffer = on jump_previous_buffer_when_closing = on @@ -173,6 +175,7 @@ status_data_other = default status_data_private = lightgreen status_filter = green status_more = yellow +status_mouse = green status_name = *white status_name_ssl = lightgreen status_nicklist_count = default @@ -181,6 +184,7 @@ status_time = *254 [completion] base_word_until_cursor = on +command_inline = on default_template = "%(nicks)|%(irc_channels)" nick_add_space = on nick_completer = ":" diff --git a/weechat/xfer.conf b/weechat/xfer.conf index 6e78f2a9..43d14444 100644 --- a/weechat/xfer.conf +++ b/weechat/xfer.conf @@ -1,5 +1,5 @@ # -# xfer.conf -- weechat v1.0.1 +# xfer.conf -- weechat v1.1.1 # [look]