GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-03 08:04:07 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit f75b1eb356)

Conflicts:
	example-conf.yml
	plugins/relay.py
This commit is contained in:
James Lu 2018-04-03 17:41:22 -07:00
parent 5339ddcf08
commit c33f7437ef
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
example-conf.yml
View File

@ -228,10 +228,10 @@ servers:
# option on a per network-basis.
#relay_tag_nicks: true
# Sets the suffix that relay subservers that 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"
# Sets the suffix that relay subservers on this network should use.
# 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"
unrealnet:
ip: ::1
@ -665,7 +665,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:

2
plugins/relay.py
View File

@ -221,7 +221,7 @@ def spawn_relay_server(irc, remoteirc):
try:
# ENDBURST is delayed by 3 secs on supported IRCds to prevent
# triggering join-flood protection and the like.
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('.')