From d0740145ec3bc46f3945c5f2a3549343916f7889 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 13 Oct 2024 09:36:25 +0100 Subject: Resynchronise our copy of the GPLv2 with the latest FSF copy. --- docs/LICENSE.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt index 6e2ceda85..9efa6fbc9 100644 --- a/docs/LICENSE.txt +++ b/docs/LICENSE.txt @@ -1,16 +1,8 @@ - NOTE: InspIRCd is licensed under GPL version 2 only. - - "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. - ----------------------------------------------------------------------- - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -312,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + with this program; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -337,8 +328,8 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1989 - Ty Coon, President of Vice + , 1 April 1989 + Moe Ghoul, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may -- cgit v1.3.1-10-gc9f91 From 7763a034a836e18a2c417a4870d3e119444784ce Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 13 Oct 2024 09:41:26 +0100 Subject: Tell people to connect to Teranova directly instead of our alias. --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 2 +- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 2 +- .github/SECURITY.md | 2 +- README.md | 6 +++--- docs/conf/motd.txt.example | 2 +- docs/conf/opermotd.txt.example | 2 +- make/configure.pm | 2 +- make/directive.pm | 4 ++-- make/template/help.txt | 4 ++-- make/template/inspircd-genssl.1 | 2 +- make/template/inspircd-testssl.1 | 2 +- make/template/inspircd.1 | 2 +- tools/testssl | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index e299326fb..950d439df 100644 --- 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: ircs://irc.teranova.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 index 12109cc5d..07993271d 100644 --- 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: ircs://irc.teranova.net/inspircd Example configs: https://github.com/inspircd/inspircd/tree/insp3/docs/conf --> diff --git a/.github/SECURITY.md b/.github/SECURITY.md index b39b39693..a8b92eb0e 100644 --- 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 ircs://irc.teranova.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 index 24671618a..c5ddbb902 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,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 — \#inspircd on irc.inspircd.org -* Development IRC channel — \#inspircd.dev on irc.inspircd.org -* InspIRCd test network — testnet.inspircd.org +* Support IRC channel — \#inspircd on irc.teranova.net (TLS only) +* Development IRC channel — \#inspircd.dev on irc.teranova.net (TLS only) +* InspIRCd test network — testnet.inspircd.org (TLS only) diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example index cd993e9a3..a441011c1 100644 --- 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 ircs://irc.teranova.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 index b0d9b4816..5461d7f40 100644 --- 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 ircs://irc.teranova.net/inspircd | | * \bDocs:\x https://docs.inspircd.org | | * \bIssues:\x https://git.io/JIuYi | | * \bDiscussions:\x https://git.io/JIuYv | diff --git a/make/configure.pm b/make/configure.pm index a31c6ee79..7bdf44389 100644 --- 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 ircs://irc.teranova.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 index ed3f88fc2..948a8b0c8 100644 --- a/make/directive.pm +++ b/make/directive.pm @@ -153,8 +153,8 @@ 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, 'at https://github.com/inspircd/inspircd/discussions.'; + push @message, 'channel at ircs://irc.teranova.net/inspircd or create a support'; + push @message, 'discussion at https://github.com/inspircd/inspircd/discussions.'; push @message, ''; print_error @message; diff --git a/make/template/help.txt b/make/template/help.txt index c2d798d35..f97082ba4 100644 --- a/make/template/help.txt +++ b/make/template/help.txt @@ -4,8 +4,8 @@ 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, -or refer to the the docs site: +ircs://irc.teranova.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 https://docs.inspircd.org/@VERSION_MAJOR@/modules diff --git a/make/template/inspircd-genssl.1 b/make/template/inspircd-genssl.1 index e71806381..f7c7c270b 100644 --- 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.teranova.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 index c9125ac47..4c116b1da 100644 --- 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.teranova.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 index 7ddefd112..ea3cb56e6 100644 --- 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.teranova.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 index 543993cbd..5d62d6c19 100755 --- 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 ircs://irc.teranova.net/inspircd. EOM -- cgit v1.3.1-10-gc9f91