Merge remote-tracking branch 'upstream/insp3' into insp3

IRC4Fun · Jul 8, 2024 · cd24cf1 · cd24cf1
2 parents 1727b7b + 78c4f3b
commit cd24cf1
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -12,7 +12,7 @@ The GitHub issue tracker is for bug reports ONLY. General support can be found a
 
 Discussions: https://github.com/inspircd/inspircd/discussions
 Docs: https://docs.inspircd.org
-IRC: irc.inspircd.org #inspircd
+IRC: irc.chatspike.net #inspircd
 Example configs: https://github.com/inspircd/inspircd/tree/insp3/docs/conf
 -->
 

diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -10,7 +10,7 @@ The GitHub issue tracker is for feature requests ONLY. General support can be fo
 
 Discussions: https://github.com/inspircd/inspircd/discussions
 Docs: https://docs.inspircd.org
-IRC: irc.inspircd.org #inspircd
+IRC: irc.chatspike.net #inspircd
 Example configs: https://github.com/inspircd/inspircd/tree/insp3/docs/conf
 -->
 

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -18,6 +18,6 @@ Version | Supported
 
 ## Reporting a Vulnerability
 
-Please do not report security vulnerabilities on GitHub. Instead, get the attention of a developer in our development IRC channel at irc.inspircd.org #inspircd.dev and PM them the details.
+Please do not report security vulnerabilities on GitHub. Instead, get the attention of a developer in our development IRC channel at irc.chatspike.net #inspircd.dev and PM them the details.
 
 We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.
diff --git a/README.md b/README.md
@@ -67,6 +67,6 @@ InspIRCd is licensed under [version 2 of the GNU General Public License](https:/
 * [Documentation](https://docs.inspircd.org)
 * [GitHub](https://github.com/inspircd)
 * [Social Media](https://docs.inspircd.org/social)
-* Support IRC channel &mdash; \#inspircd on irc.inspircd.org
-* Development IRC channel &mdash; \#inspircd.dev on irc.inspircd.org
+* Support IRC channel &mdash; \#inspircd on irc.chatspike.net
+* Development IRC channel &mdash; \#inspircd.dev on irc.chatspike.net
 * InspIRCd test network &mdash; testnet.inspircd.org
diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt
@@ -2,7 +2,7 @@
 
       "Upgrading" to a later version of the GENERAL PUBLIC
       LICENSE is not permitted. For further information on
-      this, please contact us at irc.inspircd.org on #inspircd.
+      this, please contact us at irc.chatspike.net on #inspircd.
 
 ----------------------------------------------------------------------
 

diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example
@@ -24,7 +24,7 @@
       +---- To change this see \bmotd.txt.example\x ----+
       |                                             |
       |   * \bWeb:\x https://www.inspircd.org           |
-      |   * \bIRC:\x irc.inspircd.org #inspircd         |
+      |   * \bIRC:\x irc.chatspike.net #inspircd        |
       |   * \bDocs:\x https://docs.inspircd.org         |
       |   * \bIssues:\x https://git.io/JIuYi            |
       |   * \bDiscussions:\x https://git.io/JIuYv       |

diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example
@@ -24,7 +24,7 @@
       +-- To change this see \bopermotd.txt.example\x --+
       |                                             |
       |   * \bWeb:\x https://www.inspircd.org           |
-      |   * \bIRC:\x irc.inspircd.org #inspircd         |
+      |   * \bIRC:\x irc.chatspike.net #inspircd        |
       |   * \bDocs:\x https://docs.inspircd.org         |
       |   * \bIssues:\x https://git.io/JIuYi            |
       |   * \bDiscussions:\x https://git.io/JIuYv       |

diff --git a/include/server.h b/include/server.h
@@ -71,7 +71,7 @@ class CoreExport Server : public classbase
 
 	/**
 	 * Returns the name of this server
-	 * @return The name of this server, for example "irc.inspircd.org".
+	 * @return The name of this server, for example "irc.example.com".
 	 */
 	const std::string& GetName() const { return name; }
 

diff --git a/make/configure.pm b/make/configure.pm
@@ -180,7 +180,7 @@ non-interactive configuration is started and any omitted values are defaulted.
   <|BOLD INSPIRCD_VERBOSE=<0|1>|>        Shows additional information for debugging.
 
 If you have any problems with configuring InspIRCd then visit our IRC channel
-at irc.inspircd.org #InspIRCd or create a support discussion at
+at irc.chatspike.net #InspIRCd or create a support discussion at
 https://github.com/inspircd/inspircd/discussions.
 
 Packagers: see https://docs.inspircd.org/packaging/ for packaging advice.

diff --git a/make/directive.pm b/make/directive.pm
@@ -153,7 +153,7 @@ sub __error {
 	push @message, '';
 
 	push @message, 'If you would like help with fixing this problem then visit our IRC';
-	push @message, 'channel at irc.inspircd.org #InspIRCd or create a support discussion';
+	push @message, 'channel at irc.chatspike.net #InspIRCd or create a support discussion';
 	push @message, 'at https://github.com/inspircd/inspircd/discussions.';
 	push @message, '';
 

diff --git a/make/template/help.txt b/make/template/help.txt
@@ -4,7 +4,7 @@ In order to get your server running you need to create config files. Examples
 can be found at `@EXAMPLE_DIR@`.
 
 If you need any help with this then you can visit our support channel at
-irc.inspircd.org #inspircd, open a support discussion at https://git.io/JIuYv,
+irc.chatspike.net #inspircd, open a support discussion at https://git.io/JIuYv,
 or refer to the the docs site:
 
 	https://docs.inspircd.org/@VERSION_MAJOR@/configuration

diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1
@@ -42,6 +42,6 @@ Generates certificates using GnuTLS.
 Generates certificates using OpenSSL.
 
 .SH "SUPPORT"
-IRC support for InspIRCd can be found at ircs://irc.inspircd.org/inspircd.
+IRC support for InspIRCd can be found at ircs://irc.chatspike.net/inspircd.
 
 Bug reports and feature requests can be filed at https://github.com/inspircd/inspircd/issues.
diff --git a/make/template/inspircd-testssl.1 b/make/template/inspircd-testssl.1
@@ -41,6 +41,6 @@ The TCP port to connect to.
 Disables checking whether the server certificate is signed by a Certificate Authority.
 
 .SH "SUPPORT"
-IRC support for InspIRCd can be found at ircs://irc.inspircd.org/inspircd.
+IRC support for InspIRCd can be found at ircs://irc.chatspike.net/inspircd.
 
 Bug reports and feature requests can be filed at https://github.com/inspircd/inspircd/issues.
diff --git a/make/template/inspircd.1 b/make/template/inspircd.1
@@ -103,6 +103,6 @@ The server exited because it was unable to load a module on first run.
 The server exited because it received SIGTERM.
 
 .SH "SUPPORT"
-IRC support for InspIRCd can be found at ircs://irc.inspircd.org/inspircd.
+IRC support for InspIRCd can be found at ircs://irc.chatspike.net/inspircd.
 
 Bug reports and feature requests can be filed at https://github.com/inspircd/inspircd/issues.
diff --git a/tools/testssl b/tools/testssl
@@ -176,5 +176,5 @@ You may also find running some of the following commands to be helpful:
    openssl s_client -connect $hostip:$port -debug -security_debug
 
 If you need any help working out what is wrong then visit our support channel
-at irc.inspircd.org #inspircd.
+at irc.chatspike.net #inspircd.
 EOM