diff --git a/example-conf.yml b/example-conf.yml index 393a0d0..5e71e36 100644 --- a/example-conf.yml +++ b/example-conf.yml @@ -224,6 +224,11 @@ 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" + unrealnet: ip: ::1 port: 8067 @@ -652,7 +657,7 @@ 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. + # net2.relay, etc.) if not specified. This can also be set per-network. #server_suffix: "relay.yournet.net" # Sets whether Clientbot mode sync will be enabled. Valid options: diff --git a/plugins/relay.py b/plugins/relay.py index b5f2339..9a8c08f 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -220,7 +220,8 @@ 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 = conf.conf.get('relay', {}).get('server_suffix', 'relay') + suffix = irc.serverdata.get('server_suffix', conf.conf.get('relay', {}).get('server_suffix', 'relay')) + # Strip any leading or trailing .'s suffix = suffix.strip('.') sid = irc.proto.spawnServer('%s.%s' % (remoteirc.name, suffix),