Skip to content

Commit

Permalink
weechat: upgrade conf and use plain SASL over SSL
Browse files Browse the repository at this point in the history
  • Loading branch information
majutsushi committed Jan 28, 2015
1 parent 0a331ba commit 5ca082b
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 20 deletions.
2 changes: 1 addition & 1 deletion weechat/alias.conf
@@ -1,5 +1,5 @@
#
# alias.conf -- weechat v1.0.1
# alias.conf -- weechat v1.1.1
#

[cmd]
Expand Down
2 changes: 1 addition & 1 deletion weechat/aspell.conf
@@ -1,5 +1,5 @@
#
# aspell.conf -- weechat v1.0.1
# aspell.conf -- weechat v1.1.1
#

[color]
Expand Down
2 changes: 1 addition & 1 deletion weechat/charset.conf
@@ -1,5 +1,5 @@
#
# charset.conf -- weechat v1.0.1
# charset.conf -- weechat v1.1.1
#

[default]
Expand Down
2 changes: 1 addition & 1 deletion weechat/colorize_nicks.conf
@@ -1,5 +1,5 @@
#
# colorize_nicks.conf -- weechat v1.0.1
# colorize_nicks.conf -- weechat v1.1.1
#

[look]
Expand Down
2 changes: 1 addition & 1 deletion weechat/exec.conf
@@ -1,5 +1,5 @@
#
# exec.conf -- weechat v1.0.1
# exec.conf -- weechat v1.1.1
#

[command]
Expand Down
15 changes: 11 additions & 4 deletions 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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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 = ""
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion weechat/logger.conf
@@ -1,5 +1,5 @@
#
# logger.conf -- weechat v1.0.1
# logger.conf -- weechat v1.1.1
#

[look]
Expand Down
2 changes: 1 addition & 1 deletion weechat/plugins.conf
@@ -1,5 +1,5 @@
#
# plugins.conf -- weechat v1.0.1
# plugins.conf -- weechat v1.1.1
#

[var]
Expand Down
3 changes: 2 additions & 1 deletion weechat/relay.conf
@@ -1,5 +1,5 @@
#
# relay.conf -- weechat v1.0.1
# relay.conf -- weechat v1.1.1
#

[look]
Expand All @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion weechat/script.conf
@@ -1,5 +1,5 @@
#
# script.conf -- weechat v1.0.1
# script.conf -- weechat v1.1.1
#

[look]
Expand Down Expand Up @@ -46,3 +46,4 @@ cache_expire = 60
dir = "%h/script"
hold = ""
url = "http://www.weechat.org/files/plugins.xml.gz"
url_force_https = on
8 changes: 4 additions & 4 deletions weechat/trigger.conf
@@ -1,5 +1,5 @@
#
# trigger.conf -- weechat v1.0.1
# trigger.conf -- weechat v1.1.1
#

[look]
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion weechat/urlgrab.conf
@@ -1,5 +1,5 @@
#
# urlgrab.conf -- weechat v1.0.1
# urlgrab.conf -- weechat v1.1.1
#

[color]
Expand Down
6 changes: 5 additions & 1 deletion weechat/weechat.conf
@@ -1,5 +1,5 @@
#
# weechat.conf -- weechat v1.0.1
# weechat.conf -- weechat v1.1.1
#

[debug]
Expand Down Expand Up @@ -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 --"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 = ":"
Expand Down
2 changes: 1 addition & 1 deletion weechat/xfer.conf
@@ -1,5 +1,5 @@
#
# xfer.conf -- weechat v1.0.1
# xfer.conf -- weechat v1.1.1
#

[look]
Expand Down

0 comments on commit 5ca082b

Please sign in to comment.