From d09c1be688d05d06d373cc3e5ff6db0aaca2f037 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 1 Oct 2017 00:39:28 -0700 Subject: [PATCH 1/2] README: update IRC link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d6ee8a..7f7b0dc 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ PyLink and any bundled software are licensed under the Mozilla Public License, v Please report any bugs you find to the [issue tracker](https://github.com/GLolol/PyLink/issues). Pull requests are open if you'd like to contribute, though new stuff generally goes to the **devel** branch. -You can also find support via our IRC channels: `#PyLink @ irc.overdrivenetworks.com `([webchat][webchatlink]) or `#PyLink @ chat.freenode.net`. Ask your questions and be patient for a response. +You can also find support via our IRC channel at `#PyLink @ irc.overdrivenetworks.com `([webchat][webchatlink]). Ask your questions and be patient for a response. ## Installation From e8b7116888959352f9e32f4d8ac94b66ae0bb831 Mon Sep 17 00:00:00 2001 From: James Lu Date: Wed, 11 Oct 2017 17:59:16 -0700 Subject: [PATCH 2/2] example-conf: clarify terminology regarding server IDs P10 calls them server numerics, for example. Also clarify what the sid and sidrange options are used for (i.e. why they need to be set). [skip ci] --- example-conf.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/example-conf.yml b/example-conf.yml index b8a4086..17fb987 100644 --- a/example-conf.yml +++ b/example-conf.yml @@ -127,16 +127,17 @@ servers: # Hostname we will use to connect to the remote server hostname: "pylink.yournet.local" - # SID - required for TS6 and TS6-like servers. This must be three characters: - # the first char must be a digit [0-9], and the remaining two chars may - # be either uppercase letters [A-Z] or digits. + # Sets the server ID (SID) that the main PyLink server should use. + # For TS6-like servers (InspIRCd, Charybdis, UnrealIRCd, etc.), this + # must be three characters: the first char must be a digit [0-9], and + # the remaining two may be either uppercase letters [A-Z] or digits. sid: "0PY" - # SID range - the range of SIDs PyLink is allowed to use to generate - # server IDs. On TS6, this should be a combination of digits, letters, - # and #'s. Each # denotes a range (0-9A-Z) of characters that can be - # used by PyLink to generate appropriate SIDs. You will want to make - # sure no other servers are using this range. + # Server ID range: this specifies the range of server IDs that PyLink + # may use for subservers such as relay. On TS6, this should be a + # combination of digits, letters, and #'s. Each # denotes a range (0-9A-Z) + # of characters that can be used by PyLink to generate appropriate SIDs. + # You will want to make sure no other servers are using this range. # There must be at least one # in this entry. sidrange: "8##" @@ -284,8 +285,11 @@ servers: sendpass: "send" hostname: "pylink.midnight.vpn" - # For P10, the SID and SID range options are just numbers. Make sure nothing - # else is using the range you're reserving for PyLink. + # For P10, the SID and SID range options correspond to P10 server numerics. The PyLink + # "sid" should be the numeric of the main server, and "sidrange" should be a range of + # numerics that subservers (e.g. for relay) can use. + # Make sure no other servers are in the numeric range you're reserving for PyLink, or you + # may get conflicts. sid: 50 sidrange: "100-150" channels: ["#lounge"]