Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify semantics of vhost/vhostv6 #1609

Merged
merged 2 commits into from
Dec 20, 2024
+14 −4
Merged

Clarify semantics of vhost/vhostv6 #1609

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7386ea6
Clarify semantics of vhost/vhostv6
progval Dec 14, 2024
4efefe7
reword
progval Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,15 @@ def registerNetwork(name, password='', ssl=True, sasl_username='',
registerGlobalValue(network, 'vhost',
registry.String('', _("""Determines what vhost the bot will bind to before
connecting a server (IRC, HTTP, ...) via IPv4. If empty, defaults to
supybot.protocols.irc.vhost""")))
supybot.protocols.irc.vhost. It must be (or resolve to) an IP address
assigned to one of the network interfaces (see 'ip addr' on Linux).
This may differ from the bot's public IP address, if it is behind a NAT.""")))
registerGlobalValue(network, 'vhostv6',
registry.String('', _("""Determines what vhost the bot will bind to before
connecting a server (IRC, HTTP, ...) via IPv6. If empty, defaults to
supybot.protocols.irc.vhostv6""")))
supybot.protocols.irc.vhostv6. It must be (or resolve to) an IP address
assigned to one of the network interfaces (see 'ip addr' on Linux).
This may differ from the bot's public IP address, if it is behind a NAT.""")))

sasl = registerGroup(network, 'sasl')
registerGlobalValue(sasl, 'username', registry.String(sasl_username,
Expand Down Expand Up @@ -1363,11 +1367,17 @@ def makeExtBanmasks(self, hostmask, options=None, channel=None, *, network):

registerGlobalValue(supybot.protocols.irc, 'vhost',
registry.String('', _("""Determines what vhost the bot will bind to before
connecting a server (IRC, HTTP, ...) via IPv4.""")))
connecting a server (IRC, HTTP, ...) via IPv4. It must be (or resolve to)
an IP address assigned to one of the network interfaces (see 'ip addr' on
Linux).
This may differ from the bot's public IP address, if it is behind a NAT.""")))

registerGlobalValue(supybot.protocols.irc, 'vhostv6',
registry.String('', _("""Determines what vhost the bot will bind to before
connecting a server (IRC, HTTP, ...) via IPv6.""")))
connecting a server (IRC, HTTP, ...) via IPv6. It must be (or resolve to)
an IP address assigned to one of the network interfaces (see 'ip -6 addr' on
Linux).
This may differ from the bot's public IP address, if it is behind a NAT.""")))

registerGlobalValue(supybot.protocols.irc, 'maxHistoryLength',
registry.Integer(1000, _("""Determines how many old messages the bot will
Expand Down