3
0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-11 12:42:34 +01:00

Rename servers::<netname>::server_suffix -> servers::<netname>::relay_server_suffix

This commit is contained in:
James Lu 2018-04-03 17:41:22 -07:00
parent 7586989763
commit f75b1eb356
2 changed files with 6 additions and 5 deletions

View File

@ -221,9 +221,9 @@ servers:
#relay_forcetag_nicks: ["someuser", "Guest*"]
# Sets the suffix that relay subservers on this network should use.
# If not specified per network, falls back to the value at
# relay:server_suffix or "relay" if that is not set.
#server_suffix: "relay.yournet.net"
# If not specified per network, this falls back to the value at
# relay::server_suffix, or "relay" if that is also not set.
#relay_server_suffix: "relay.yournet.net"
# Determines whether relay will tag nicks on this network. This overrides the relay::tag_nicks
# option on a per network-basis.
@ -690,7 +690,8 @@ relay:
allow_clientbot_pms: false
# Sets the suffix that relay subservers should use. Defaults to "relay" (as in net1.relay,
# net2.relay, etc.) if not specified. This can also be set per-network.
# net2.relay, etc.) if not specified. This can also be set per-network via
# servers::<netname>::relay_server_suffix.
#server_suffix: "relay.yournet.net"
# Sets whether Clientbot mode sync will be enabled. Valid options:

View File

@ -230,7 +230,7 @@ def spawn_relay_server(irc, remoteirc):
"""
if irc.connected.is_set():
try:
suffix = irc.serverdata.get('server_suffix', conf.conf.get('relay', {}).get('server_suffix', 'relay'))
suffix = irc.serverdata.get('relay_server_suffix', conf.conf.get('relay', {}).get('server_suffix', 'relay'))
# Strip any leading or trailing .'s
suffix = suffix.strip('.')