ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-07 00:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into insp4.

Browse Source
This commit is contained in:
Sadie Powell 2024-10-17 12:33:11 +01:00
commit 73bc08d743
13 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/BUG_REPORT.md vendored
View File

@ -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 (v3): https://github.com/inspircd/inspircd/tree/insp3/docs/conf
Example configs (v4): https://github.com/inspircd/inspircd/tree/insp4/docs/conf
-->

2
.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md vendored
View File

@ -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 (v3): https://github.com/inspircd/inspircd/tree/insp3/docs/conf
Example configs (v4): https://github.com/inspircd/inspircd/tree/insp4/docs/conf
-->

2
.github/SECURITY.md vendored
View File

@ -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.

6
README.md
View File

@ -44,6 +44,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)

17
docs/LICENSE.txt
View File

@ -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
<https://fsf.org/>
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 <https://www.gnu.org/licenses/>.
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.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
<signature of Moe Ghoul>, 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

2
docs/conf/motd.example.txt
View File

@ -24,7 +24,7 @@
+---- To change this see \bmotd.example.txt\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 |

2
docs/conf/opermotd.example.txt
View File

@ -24,7 +24,7 @@
+-- To change this see \bopermotd.example.txt\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 |

2
make/configure.pm
View File

@ -179,7 +179,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.

4
make/directive.pm
View File

@ -161,8 +161,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;

4
make/template/help.txt
View File

@ -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

2
make/template/inspircd-testssl.1
View File

@ -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.

2
make/template/inspircd.1
View File

@ -61,6 +61,6 @@ Allow the server to start as root (not recommended).
Displays the InspIRCd version and exits.
.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.

2
tools/testssl
View File

@ -170,5 +170,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