diff --git a/README.md b/README.md index d139b7aecd..3190026c3a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Introduction ------------ -LibreNMS is an autodiscovering PHP/MySQL/SNMP based network monitoring +LibreNMS is an auto-discovering PHP/MySQL/SNMP based network monitoring which includes support for a wide range of network hardware and operating systems including Cisco, Linux, FreeBSD, Juniper, Brocade, Foundry, HP and many more. @@ -14,10 +14,7 @@ We intend LibreNMS to be a viable project and community that: - offers a welcoming, friendly environment for everyone. The [Debian Social Contract][10] will be the basis of our priority system, -and mutual respect is the basis of our behaviour towards others. For more -about the culture we're trying to build, please read the [Freenode -philosophy][13], including [guidelines for running an IRC channel][6] and -[being a community catalyst][7]. +and mutual respect is the basis of our behavior towards others. Documentation @@ -34,8 +31,8 @@ You can participate in the project by: - Talking to us on [Discord][4] or [Twitter][3]. - Joining the [LibreNMS Community](https://community.librenms.org) - Improving the [documentation][5]. -- Cloning the [repo][2] and filing [pull requests][19] on github. -- [Bug Reports](https://community.librenms.org) on our Community Fourms +- Cloning the [repository][2] and filing [pull requests][19] on GitHub. +- [Bug Reports](https://community.librenms.org) on our Community Forums - See [CONTRIBUTING][15] for more details. @@ -85,12 +82,9 @@ exception): [3]: https://twitter.com/librenms "@LibreNMS on Twitter" [4]: https://discord.gg/librenms "Discord LibreNMS Server" [5]: https://github.com/librenms/librenms/tree/master/doc/ -[6]: http://freenode.net/changuide "Freenode channel guidelines" -[7]: http://freenode.net/catalysts "Freenode community catalysts" [8]: https://www.virtualbox.org/ "VirtualBox" [10]: http://www.debian.org/social_contract "Debian project social contract" [11]: https://www.librenms.org/#downloads -[13]: http://freenode.net/philosophy.shtml "Freenode philosophy" [14]: https://github.com/librenms/librenms/tree/master/LICENSE.txt [15]: https://docs.librenms.org/General/Contributing/ [16]: https://docs.librenms.org/ diff --git a/composer.json b/composer.json index a0f82fd8d2..a9fc231475 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "librenms/librenms", - "description": "A fully featured network monitoring system that provides a wealth of features and device support.", "type": "project", + "description": "A fully featured network monitoring system that provides a wealth of features and device support.", "keywords": [ "network", "monitoring", @@ -13,15 +13,8 @@ ], "homepage": "https://www.librenms.org/", "license": "GPL-3.0-or-later", - "support": { - "source": "https://github.com/librenms/librenms/", - "docs": "http://docs.librenms.org/", - "forum": "https://community.librenms.org/", - "issues": "https://github.com/librenms/librenms/issues/", - "irc": "irc://irc.freenode.org/#librenms" - }, "require": { - "php": "^7.3|^8.0", + "php": "^7.3 || ^8.0", "ext-curl": "*", "ext-gd": "*", "ext-json": "*", @@ -77,17 +70,26 @@ "staudenmeir/dusk-updater": "^1.1" }, "suggest": { + "ext-ldap": "*", "ext-memcached": "Required if you utilize distributed polling", - "ext-posix": "Allows for additional validation tests", "ext-mysqlnd": "*", - "ext-ldap": "*" + "ext-posix": "Allows for additional validation tests" + }, + "config": { + "discard-changes": true, + "optimize-autoloader": true, + "platform-check": true, + "preferred-install": "dist", + "sort-packages": true + }, + "extra": { + "laravel": { + "dont-discover": [ + "nunomaduro/laravel-console-summary" + ] + } }, "autoload": { - "exclude-from-classmap": [ - "/vendor/laravel/laravel/database/", - "/vendor/laravel/laravel/app/", - "/html/plugins" - ], "psr-4": { "App\\": "app", "LibreNMS\\": "LibreNMS", @@ -101,26 +103,15 @@ ], "files": [ "includes/helpers.php" + ], + "exclude-from-classmap": [ + "/vendor/laravel/laravel/database/", + "/vendor/laravel/laravel/app/", + "/html/plugins" ] }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true, - "platform-check": true, - "discard-changes": true - }, "scripts": { - "pre-update-cmd": "LibreNMS\\ComposerHelper::preUpdate", "pre-install-cmd": "LibreNMS\\ComposerHelper::preInstall", - "post-root-package-install": "LibreNMS\\ComposerHelper::postRootPackageInstall", - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" - ], - "post-create-project-cmd": [ - "@php artisan key:generate --ansi" - ], "post-install-cmd": [ "LibreNMS\\ComposerHelper::postInstall", "Illuminate\\Foundation\\ComposerScripts::postInstall", @@ -130,18 +121,33 @@ "@php artisan config:clear", "@python-requirements" ], + "pre-update-cmd": "LibreNMS\\ComposerHelper::preUpdate", "post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate" ], + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi" + ], + "post-root-package-install": "LibreNMS\\ComposerHelper::postRootPackageInstall", + "post-create-project-cmd": [ + "@php artisan key:generate --ansi" + ], "python-requirements": [ "scripts/check_requirements.py || pip3 install --user -r requirements.txt || :" ] }, - "extra": { - "laravel": { - "dont-discover": [ - "nunomaduro/laravel-console-summary" - ] + "support": { + "issues": "https://github.com/librenms/librenms/issues/", + "forum": "https://community.librenms.org/", + "chat": "https://discord.gg/librenms", + "source": "https://github.com/librenms/librenms/", + "docs": "https://docs.librenms.org/" + }, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/librenms" } - } + ] } diff --git a/composer.lock b/composer.lock index 09d2a5929a..b85fcb2311 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "20641974e2977b85a492b8cd89fd0fac", + "content-hash": "7e036d2ebed332bf23de83ae6dd716a3", "packages": [ { "name": "amenadiel/jpgraph", @@ -11449,7 +11449,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3|^8.0", + "php": "^7.3 || ^8.0", "ext-curl": "*", "ext-gd": "*", "ext-json": "*", @@ -11460,5 +11460,5 @@ "ext-xml": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" } diff --git a/doc/Extensions/IRC-Bot.md b/doc/Extensions/IRC-Bot.md index 1fc37f328b..d99da32a99 100644 --- a/doc/Extensions/IRC-Bot.md +++ b/doc/Extensions/IRC-Bot.md @@ -62,20 +62,20 @@ Command | Description ### Server examples -Unencrypted Connection to `irc.freenode.org`: +Unencrypted Connection to `irc.libera.chat`: ```php ... - $config['irc_host'] = "irc.freenode.org"; + $config['irc_host'] = "irc.libera.chat"; $config['irc_port'] = 6667; ... ``` -SSL-Encrypted Connection to `irc.freenode.org`: +SSL-Encrypted Connection to `irc.libera.chat`: ```php ... - $config['irc_host'] = "irc.freenode.org"; + $config['irc_host'] = "irc.libera.chat"; $config['irc_port'] = "+6697"; ... ```