.github/CONTRIBUTING.md

@@ -0,0 +1,23 @@
+# Contribution Guidelines
+
+This is a compilation of **Free and Libre Open Source Software ([FLOSS](https://en.wikipedia.org/wiki/Free_and_open-source_software))**. Restrictive licenses (aka Freeware, Shareware) are *not awesome*. Please adhere to the following guidelines or your Pull Request will be closed.
+
+**Submitting your own software is not awesome**, unless you have a healthy ecosystem with a few contributors which aren't your sock puppet accounts.
+
+## Commits
+
+* Search previous suggestions before making a new one.
+* Use the following format: `[RESOURCE](LINK) - DESCRIPTION.`
+  * Keep descriptions short (<80 characters).
+  * End descriptions with a full stop.
+* Make an individual commit for each category.
+  * Order projects alphabetically.
+
+## Pull Requests
+
+* Consolidate multiple commits.
+* Use imperative (e.g. add instead of added/adding) in the PR title.
+* Include application names, categories and a link to the open source project page in the description.
+* Write a short text why the application you're adding is actually awesome.
+  * Put only stuff on the list you or another contributor can personally recommend
+  * Recommending your own software is discouraged.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +1,9 @@
-<!-- DO NOT DELETE THE TEXT BELOW. Please make sure relevant boxes are checked [x] -->
+### Application name / category
+[awesometool](https://example.com) / Devops
 
-Thank you for taking the time to work on a PR for Awesome-Sysadmin!
+### Source URL
+https://github.example.com/repo
 
-To ensure your PR is dealt with swiftly please check the following:
+### why it is awesome
-
+This tool is so awesome because it allows me to do awesome things in my
-- [ ] Your additions are [Free software](https://en.wikipedia.org/wiki/Free_software)
+awesome corp, especially when I use it to manage awesome othersoftware.
-- [ ] Software your are submitting is not your own, unless you have a healthy ecosystem with a few contributors (which aren't your sock puppet accounts).
-- [ ] Submit one item per pull request. This eases reviewing and speeds up inclusion.
-- [ ] Format your submission as follows, where `Demo` and `Clients` are optional.
-  Do not add a duplicate `Source code` link if it is the same as the main link.
-  Keep the short description under 80 characters and use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case)
-  for it, even if the project's webpage or readme uses another capitalisation.
-  `Demo` links should only be used for interactive demos, i.e. not video demonstrations.
-  ``- [Name](http://homepage/) - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
-- [ ] Additions are inserted preserving alphabetical order.
-- [ ] Additions are not already listed at [awesome-selfhosted](https://github.com/awesome-foss/awesome-sysadmin)
-- [ ] The `Language` tag is the main **server-side** requirement for the software. Don't include frameworks or specific dialects.
-- [ ] You have searched the repository for any relevant [issues](https://github.com/awesome-foss/awesome-sysadmin/issues) or [PRs](https://github.com/awesome-foss/awesome-sysadmin/pulls), including closed ones.
-- [ ] Any category you are creating has the minimum requirement of 3 items.
-- [ ] Any software project you are adding to the list is actively maintained.
-- [ ] The pull request title is informative, unlike "Update README.md".
-  Suggested titles: "Add aaa to bbb" for adding software aaa to section bbb,
-  "Remove aaa from bbb" for removing, "Fix license for aaa", etc.
-
-
---------------
-
-### Why it is awesome
-
-Please replace this with a short paragraph explaning why you think this software is awesome.

README.md

@@ -6,7 +6,7 @@
 
 # Awesome Sysadmin [![certified awesome!](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
-**A curated list of amazingly awesome Free and Open-Source sysadmin resources.** Please read the [Pull Request template](./.github/PULL_REQUEST_TEMPLATE.md) if you wish to add software and consider [donating](https://github.com/n1trux/awesome-donations) to the FLOSS projects you use regularly.
+**A curated list of amazingly awesome open source sysadmin resources.** Please read [CONTRIBUTING](./.github/CONTRIBUTING.md) if you wish to add software and consider [donating](https://github.com/n1trux/awesome-donations) to the FLOSS projects you use regularly.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
@@ -127,13 +127,12 @@
 
 ## Client management
 
-Managing software on desktop computers.
+*Managing software on desktop computers.*
-
-_See also: [IT Asset Management](#it-asset-management)_
 
 * [Chocolatey](https://chocolatey.org/) – Windows CLI package manager written in .NET/PS, based on [NuGet](https://www.nuget.org/).
 * [just-install](https://just-install.github.io/) – Python script for downloading and silently installing MSI files.
 * [OCS Inventory NG](https://ocsinventory-ng.org/?lang=en) - Inventory, deployment and network scan.
+* [Opsi](http://www.opsi.org) (open PC server integration) - Client Management for Windows based on Debian.
 * [WAPT](https://dev.tranquil.it/wiki/WAPT_-_apt-get_pour_Windows/en) - Network-wide (un)installation, configuration and upgrades of Windows based software.
 * [WPKG](http://wpkg.org/) - Software deployment, upgrade and removal program for Windows.
 
@@ -169,7 +168,6 @@ _See also: [IT Asset Management](#it-asset-management)_
 * [Juju](https://jujucharms.com/) - Cloud orchestration tool which manages services as charms, YAML configuration and deployment script bundles.
 * [Kubernetes](http://kubernetes.io/) - Orchestration system for Docker containers - ([Source Code](https://github.com/kubernetes/kubernetes), [Documentation](http://kubernetes.io/docs/)) `Apache` `Go`
 * [MCollective](https://puppet.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
-* [Nomad](https://www.nomadproject.io) - Simple and flexible orchestrator for Docker, Podman, executables, Java, and QEMU - ([Source Code](https://github.com/hashicorp/nomad), [Documentation](https://www.nomadproject.io/docs)) `MPL-2.0` `Go`
 * [Overcast](http://andrewchilds.github.io/overcast/) - Deploy VMs across different cloud providers, and run commands and scripts across any or all of them in parallel via SSH.
 * [Rundeck](http://rundeck.org/) - Simple orchestration tool.
 * [Salt](http://saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
@@ -189,12 +187,11 @@ _See also: [IT Asset Management](#it-asset-management)_
 
 ## Configuration Management Database
 
-Configuration management database (CMDB) software.
+*Configuration management database (CMDB) software.*
-
-_See also: [IT Asset Management]([Ralph](#it-asset-management))_
 
 * [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
 * [iTop](http://www.combodo.com/itop-193) - Complete ITIL web based service management tool.
+* [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
 * [Clusto](https://github.com/clusto/clusto) - Helps you keep track of your inventory, where it is, how it's connected, and provides an abstracted interface for interacting with the elements of the infrastructure.
 * [Collins](http://tumblr.github.io/collins/) - At Tumblr, it's the infrastructure source of truth and knowledge.
 * [netbox](https://github.com/digitalocean/netbox) - IP address management (IPAM) and data center infrastructure management (DCIM) tool
@@ -323,7 +320,7 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
 
 *Open source code editors.*
 
-* [Atom Community](https://github.com/atom-community/atom) - A fork of [atom](https://github.com/atom/atom) A hackable text editor from Github.
+* [Atom](https://atom.io/) - A hackable text editor from Github.
 * [Brackets](http://brackets.io/) - Code editor for web designers and front-end developers.
 * [Eclipse](http://www.eclipse.org/) - IDE written in Java with an extensible plug-in system.
 * [Geany](http://www.geany.org/) - GTK2 text editor.
@@ -333,11 +330,12 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
 * [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing.
 * [KDevelop](https://www.kdevelop.org/) - IDE by the people behind KDE.
 * [Light Table](http://lighttable.com/) - The next generation code editor.
+* [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
 * [Micro](https://micro-editor.github.io/) - A modern and intuitive terminal-based text editor
 * [Notepad++](https://notepad-plus-plus.org/) - GPLv2 multi-language editor with syntax highlighting for Windows.
 * [TextMate](https://github.com/textmate/textmate/) - A graphical text editor for OS X.
 * [Vim](http://www.vim.org) - A highly configurable text editor built to enable efficient editing.
-* [VSCodium](https://github.com/VSCodium/vscodium) - An open source cross-platform extensible code editor based on [VS Code by Microsoft](https://code.visualstudio.com/) removing their non-free additions.
+* [Visual Studio Code](https://code.visualstudio.com/) - An open source cross-platform extensible code editor from Microsoft
 * [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
 
 ## Identity Management
@@ -374,11 +372,11 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
 *IT Assets Management software.*
 
 * [GLPI](https://www.glpi-project.org/) - Information Resource-Manager with an additional Administration Interface.
-* [OCS Inventory NG](https://ocsinventory-ng.org/) - Asset management and deployment solution for all devices in your IT Department. ([Source Code](https://github.com/OCSInventory-NG)) `GPL-2.0` `PHP/Perl`
+* [OCS Inventory NG](https://ocsinventory-ng.org/?lang=en) - Enables users to inventory their IT assets.
-* [OPSI](http://www.opsi.org) - Hardware and software inventory, client management, deployment, and patching for Linux and Windows. ([Source Code](https://github.com/opsi-org/)) `GPL-3.0/AGPL-3.0` `OVF/Python`
+* [OPSI](http://www.opsi.org) - Hardware and software inventory, deployment, and patching for Linux and Windows.
-* [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration. ([Source Code](https://github.com/RackTables/racktables), [Demo](https://www.racktables.org/demo.php)) `GPL-2.0` `PHP`
+* [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration.
-* [Ralph](https://ralph.allegro.tech/) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks. ([Source Code](https://github.com/allegro/ralph), [Demo](https://github.com/allegro/ralph#live-demo)) `Apache-2.0` `Python/Docker`
+* [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
-* [Snipe IT](https://snipeitapp.com/) - Asset & license management software. ([Source Code](https://github.com/snipe/snipe-it)) `AGPL-3.0` `PHP`
+* [Snipe IT](https://snipeitapp.com/) - Asset & license management software.
 
 ## Log Management
 
@@ -416,7 +414,7 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [cadvisor](https://github.com/google/cadvisor) - Analyzes resource usage and performance characteristics of running containers ([Source Code](https://github.com/google/cadvisor)) `Apache` `Go`
-* [checkmk](https://checkmk.com/) - Comprehensive solution for monitoring of applications, servers, and networks. ([Source Code](https://github.com/tribe29/checkmk)) `Python/PHP`
+* [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
 * [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 * [EdMon](https://github.com/Edraens/EdMon) - A command-line monitoring application helping you to check that your hosts and services are available, with notifications support. `MIT` `Java`
 * [ElastiFlow](https://github.com/robcowart/elastiflow) - Network flow Monitoring (Netflow, sFlow and IPFIX) with the Elastic Stack.
@@ -444,6 +442,7 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
 * [Sensu](https://sensuapp.org/) - Monitoring framework.
 * [ServerStatus BotoX](https://github.com/BotoX/ServerStatus) - Display and monitor your servers statistics in a beatiful way.
 * [ServerStatus moejda](https://github.com/mojeda/ServerStatus) - Server Status website script, displays uptime (days), free RAM, free HDD
+* [SWMP - Server Web Monitor Page](https://swmp.ml/) - A responsive, eye-pleasing Linux server statistics dashboard.([Source Code](https://github.com/fuzzymannerz/swmp))
 * [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
 * [Uchiwa](https://uchiwa.io/) - Simple dashboard for sensu.
 * [Vector](https://github.com/Netflix/vector/) - An on-host performance monitoring framework.
@@ -483,10 +482,9 @@ _See also: [IT Asset Management]([Ralph](#it-asset-management))_
   * [InfluxDB](https://influxdb.com/) - Distributed time series database with no external dependencies.
 
 * Packages
-  * [Graphite](http://graphite.readthedocs.org/en/latest/) - Scalable graphing server.
-  * [Packetbeat](https://www.elastic.co/products/beats) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
   * [Prometheus](http://prometheus.io/) - Service monitoring system and time series database.
-  * [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics) - Service monitoring system and time series database.
+  * [Packetbeat](https://www.elastic.co/products/beats) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
+  * [Graphite](http://graphite.readthedocs.org/en/latest/) - Scalable graphing server.
 
 ## Network Configuration Management
 
@@ -535,7 +533,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Packaging
 
-* [aptly](https://www.aptly.info/) - Swiss army knife for Debian repository management. ([Source Code](https://github.com/aptly-dev/aptly)) `MIT` `Go`
 * [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
 * [omnibus-ruby](https://github.com/chef/omnibus) - Full stack, cross distro packaging software (Ruby).
 * [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
@@ -570,9 +567,10 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Remote Management
 
-* [Remmina](http://www.remmina.org/wp/) - A Feature rich remote desktop application for linux  and other unixes.
 * [Tiger VNC](http://tigervnc.org/) - TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), a client/server application that allows users to launch and interact with graphical applications on remote machines.
+* [Remmina](http://www.remmina.org/wp/) - A Feature rich remote desktop application for linux  and other unixes.
 * [X2go](http://wiki.x2go.org/doku.php) - X2Go is an open source remote desktop software for Linux that uses the NX technology protocol.
+* [rdpwrap](https://github.com/stascorp/rdpwrap) - RDP wrapper library allowing Remote Desktop Host support and concurrent RDP sessions on reduced functionality systems for home usage.
 
 ## Service Discovery