From a3a5fcdd79de075757a23435c268df44be7d4221 Mon Sep 17 00:00:00 2001
From: nbuihner <nbuihner@hbuhsd.edu>
Date: Mon, 30 Jun 2014 15:52:23 -0700
Subject: [PATCH 001/193] Added TRK

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..dc72b99 100644
--- a/README.md
+++ b/README.md
@@ -367,6 +367,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
 * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
+* [TRK](http://trinityhome.org) - CPR for your computer! Trinity Rescue Kit is a linux toolkit as a livecd for general computer troubleshooting. Useful for Win, Linux, and OSX.
 
 ## Project Management
 *Web-based project management and bug tracking systems.*
-- 
GitLab


From 85c1aca8de184fbf117eb2164bd74500fa814c58 Mon Sep 17 00:00:00 2001
From: Michael Barrett <loki77@gmail.com>
Date: Tue, 1 Jul 2014 13:42:59 -0700
Subject: [PATCH 002/193] Add ssh-ca

Certificate based SSH allows us to launch a server at time X and grant
SSH access to that server later at time X + Y without touching the
authorized keys file. Further it allows us to generate certificates that
expire at some predefined time meaning that users can be granted access
to a system for a short period of time.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..81bbb0b 100644
--- a/README.md
+++ b/README.md
@@ -342,6 +342,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
+* [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Certificate based SSH allows us to launch a server at time X and grant SSH access to that server later at time X + Y without touching the authorized keys file. Further it allows us to generate certificates that expire at some predefined time meaning that users can be granted access to a system for a short period of time.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From fd11b23b0f77a87813c09d7214fbeb2ebba78109 Mon Sep 17 00:00:00 2001
From: Michael Barrett <loki77@gmail.com>
Date: Tue, 1 Jul 2014 13:45:15 -0700
Subject: [PATCH 003/193] Shorten the description of ssh-ca.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 81bbb0b..62b32d6 100644
--- a/README.md
+++ b/README.md
@@ -342,7 +342,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
-* [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Certificate based SSH allows us to launch a server at time X and grant SSH access to that server later at time X + Y without touching the authorized keys file. Further it allows us to generate certificates that expire at some predefined time meaning that users can be granted access to a system for a short period of time.
+* [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From 0941b3cb169d040860f494cc065d0e18965059aa Mon Sep 17 00:00:00 2001
From: Michael Barrett <loki77@gmail.com>
Date: Tue, 1 Jul 2014 13:46:31 -0700
Subject: [PATCH 004/193] Alphabetical order for ssh-ca

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 62b32d6..036ab28 100644
--- a/README.md
+++ b/README.md
@@ -341,8 +341,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
-* [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
 * [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
+* [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From a66caa0217a4f42a252566c07fb043ae2eeefd05 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:32:09 +0100
Subject: [PATCH 005/193] Adding ActiveMQ

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6381550..d6743f9 100644
--- a/README.md
+++ b/README.md
@@ -297,6 +297,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
 * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
 * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
+* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker
 
 ## RDBMS
 *Relational DBMS.*
-- 
GitLab


From a755f1c9eaf11e948426883418ed4b36b13ae428 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:35:25 +0100
Subject: [PATCH 006/193] Adding flapjack and reordering message queues

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6743f9..cb625c9 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
+* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
@@ -293,11 +294,11 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Queuing
 
+* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker
 * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
 * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
 * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
 * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
-* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker
 
 ## RDBMS
 *Relational DBMS.*
-- 
GitLab


From 41b77ca32e5fe68bc16be5d95d62b597ea604947 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:37:11 +0100
Subject: [PATCH 007/193] Adding alerta monitoring system

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cb625c9..0a9de07 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Monitoring
 *Monitoring software.*
 
+* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system 
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
-- 
GitLab


From 1ab37be58897c6c665d5697c98b0bf986babf88a Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:42:52 +0100
Subject: [PATCH 008/193] Adding opennebula

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0a9de07..ca45293 100644
--- a/README.md
+++ b/README.md
@@ -396,6 +396,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
+* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
-- 
GitLab


From 8b96c0e877485294f445ef27adc6482aea78b16f Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:44:13 +0100
Subject: [PATCH 009/193] Adding proxmox VE

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ca45293..8806853 100644
--- a/README.md
+++ b/README.md
@@ -398,6 +398,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
+* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From 55b7e6c4e3269a6c8e199d77a41c778696f972b6 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Wed, 2 Jul 2014 11:46:02 +0100
Subject: [PATCH 010/193] Adding missing full stops

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8806853..4380aef 100644
--- a/README.md
+++ b/README.md
@@ -214,11 +214,11 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Monitoring
 *Monitoring software.*
 
-* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system 
+* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system. 
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
-* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system
+* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
@@ -295,7 +295,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Queuing
 
-* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker
+* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker.
 * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
 * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
 * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
@@ -396,9 +396,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
-* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple
+* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution
+* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From a59ee9c70f1f9edf36586c89a44389ee18b0c1c7 Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 7 Oct 2014 09:10:01 +0200
Subject: [PATCH 011/193] Add Brebis in Backups

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index aaa78d9..2258707 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Bacula](http://www.bacula.org) - Another Client-server model backup tool.
 * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
 * [Backuppc](http://backuppc.sourceforge.net/) - Client-server model backup tool with file pooling scheme.
+* [Brebis](http://brebisproject.org) - A fully automated backup checker
 * [Burp](http://burp.grke.org/) - Network backup and restore program.
 * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
 * [Lsyncd](https://github.com/axkibe/lsyncd) - Watches a local directory trees for changes, and then spawns a process to synchronize the changes. Uses rsync by default.
-- 
GitLab


From 5e19c2f23d204b24709ac23fe7ffb6df417ccdaa Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 7 Oct 2014 09:15:29 +0200
Subject: [PATCH 012/193] Improve Gogs description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2258707..3771c22 100644
--- a/README.md
+++ b/README.md
@@ -407,7 +407,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
 * [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
 * [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby. 
-* [Gogs](http://gogs.io/) - Written in Go.
+* [Gogs](http://gogs.io/) - A self-hosted Git service written in Go.
 * [Phabricator](http://phabricator.org/) Written in PHP.
 * [Redmine](http://www.redmine.org/) - Written in ruby on rails.
 * [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
-- 
GitLab


From eb4b2b99cb333d9c9048ce74cdbde9a4a54f9b3c Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 7 Oct 2014 09:17:00 +0200
Subject: [PATCH 013/193] Improve Salt description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3771c22..5558c45 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
 * [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://www.saltstack.com/) - It's written in Python.
+* [Salt](http://www.saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
 
 ## Cloud Storage
 
-- 
GitLab


From f5b2e489d57ec2e0d80d3638a7ce74df053404fd Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 7 Oct 2014 09:21:30 +0200
Subject: [PATCH 014/193] Add Facette to Metrics & Metric Collection

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5558c45..220b92b 100644
--- a/README.md
+++ b/README.md
@@ -260,6 +260,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Collectl](http://collectl.sourceforge.net/) - High precision system performance metrics collecting tool.
 * [Dashing](http://dashing.io/) - Ruby gem that allows for rapid statistical dashboard development. An all HTML5 approach allows for big screen displays in data centers or conference rooms.
 * [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
+* [Facette](http://facette.io) - Time series data visualization and graphing software written in Go.
 * [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
 * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
 * [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scaleable graphing server.
-- 
GitLab


From cbd5ffc4fb41a077a27b04df36ecccae9de9c374 Mon Sep 17 00:00:00 2001
From: Marc Falzon <marc@falzon.me>
Date: Tue, 7 Oct 2014 09:23:45 +0200
Subject: [PATCH 015/193] Add LXC to Software Containers

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 220b92b..ce9822b 100644
--- a/README.md
+++ b/README.md
@@ -363,6 +363,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Bitnami](https://bitnami.com/) - Produces open source installers or software packages for web applications and development stacks as well as virtual appliances.
 * [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
+* [LXC - Linux Containers](https://linuxcontainers.org/) - Userspace interface for the Linux kernel containment features.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
-- 
GitLab


From 821e5978dc28c1438901157c0a104e0a9f646432 Mon Sep 17 00:00:00 2001
From: hit9 <nz2324@126.com>
Date: Wed, 15 Oct 2014 22:53:49 +0800
Subject: [PATCH 016/193] add node-bell to monitor

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..0d5d582 100644
--- a/README.md
+++ b/README.md
@@ -241,6 +241,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
 * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
 * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
+* [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
 * [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments.
-- 
GitLab


From 38dfb4506e356ba0e65f2bf20a0e078f3219c479 Mon Sep 17 00:00:00 2001
From: saintak <wangmingsong@yeah.net>
Date: Tue, 28 Oct 2014 10:33:14 +0800
Subject: [PATCH 017/193] Update README.md

add a Analytics software ---awstats
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..9166e1c 100644
--- a/README.md
+++ b/README.md
@@ -380,6 +380,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Analog](http://www.analog.cx/) - The most popular logfile analyser in the world.
 * [GoAccess](http://goaccess.io/) - Open source real-time web log analyzer and interactive viewer that runs in a terminal.
 * [Piwik](http://piwik.org/) - Free and open source web analytics application.
+* [AWStats](http://www.awstats.org/) - free powerful and featureful tool that generates advanced web, streaming, ftp or mail server statistics, graphically
 * [Webalizer](http://www.webalizer.org/) - Fast, free web server log file analysis program.
 
 ## Ticketing systems
-- 
GitLab


From a83c312ecc1365e1225af01204bfe67c514d4641 Mon Sep 17 00:00:00 2001
From: joachim <joachim.cherqui@viacesi.fr>
Date: Tue, 28 Oct 2014 11:17:34 +0100
Subject: [PATCH 018/193] Add Mail-in-a-Box

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..e0aa803 100644
--- a/README.md
+++ b/README.md
@@ -356,6 +356,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement.
 * [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
 * [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA).
+* [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
 
 ## Software Containers
 *Operating system–level virtualization.*
-- 
GitLab


From 095ac863fc862cfd68513d77958bf25f6d5b2a31 Mon Sep 17 00:00:00 2001
From: Ignacio Mendizabal <ignacio@inakanetworks.com>
Date: Tue, 11 Nov 2014 10:50:33 -0300
Subject: [PATCH 019/193] adding snort to security list

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..61a1f33 100644
--- a/README.md
+++ b/README.md
@@ -337,6 +337,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
 
 ## Service Discovery
-- 
GitLab


From fa93c756f359075cdf62a4e5a7e9b35ba7cc220c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Kr=C3=A4uter?= <kraeutert@gmail.com>
Date: Wed, 12 Nov 2014 10:54:22 +0100
Subject: [PATCH 020/193] Add Bareos Backup Info

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..48f2ee1 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 
 * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
 * [Bacula](http://www.bacula.org) - Another Client-server model backup tool.
+* [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
 * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
 * [Backuppc](http://backuppc.sourceforge.net/) - Client-server model backup tool with file pooling scheme.
 * [Burp](http://burp.grke.org/) - Network backup and restore program.
-- 
GitLab


From e07bcefde7b088326d47ff50d808ac58e4684744 Mon Sep 17 00:00:00 2001
From: James Fryman <james@fryman.io>
Date: Thu, 20 Nov 2014 12:44:37 -0600
Subject: [PATCH 021/193] Add StackStorm

This pull adds StackStorm (http://www.stackstorm.com) to the list of cloud orchestration tools. This tool ingests events from different tools in an environment and triggers additional actions/workflows based on the user configuration. In addition, actions can be run arbitrary using ChatOps, adding additional context around operations management into the same human conversation happening in a Chat Room.

Thank you for your consideration.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..60f770c 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [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://www.saltstack.com/) - It's written in Python.
+* [StackStorm](http://stackstorm.com/) - Event Driven Operations and ChatOps platform for infrastructure management. Written in Python
 
 ## Cloud Storage
 
-- 
GitLab


From 0b2656946f1e3ce96bf621e979500dc986af9dc9 Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Tue, 25 Nov 2014 17:52:33 -0800
Subject: [PATCH 022/193] Add blackbox reference

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..9ac4793 100644
--- a/README.md
+++ b/README.md
@@ -335,6 +335,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Security
 *Security tools.*
 
+* [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
-- 
GitLab


From 1106b7dab2d44e2fdc3c4e30acad686f4536d108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Wed, 3 Dec 2014 14:50:38 +0100
Subject: [PATCH 023/193] Added ZBackup

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..6047831 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [TarSnap](https://www.tarsnap.com/) - Secure backup service with an open-source client.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
+* [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool
 
 ## Cloning
 *Cloning software.*
-- 
GitLab


From fa377a179dbd0edf60847cacde5dfdacab674620 Mon Sep 17 00:00:00 2001
From: Stefan Schlesinger <sts@ono.at>
Date: Sun, 21 Dec 2014 02:27:00 +0100
Subject: [PATCH 024/193] Adding Oxidized

Adding Oxidized a network configuration management tool.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..ca72502 100644
--- a/README.md
+++ b/README.md
@@ -273,6 +273,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 *Network configuration management tools.*
 
 * [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
+* [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interace and GIT storage.
 * [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configurarion and maintain history of changes.
 * [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
 
-- 
GitLab


From 83a7d18c0216a88f225e672f599ab7af3d4c75d3 Mon Sep 17 00:00:00 2001
From: Stefan Schlesinger <sts@ono.at>
Date: Sun, 21 Dec 2014 02:32:48 +0100
Subject: [PATCH 025/193] Adding two takes on the CMDB: Collins and Sizekit.

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ca72502..d623c2d 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,9 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [i-doit](http://www.i-doit.org/) - Open Source IT Documentation and CMDB.
 * [iTop](http://www.combodo.com/-Overview-.html) - A complete open source, 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.
+* [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopedia toolkit (based on mediawiki).
 * [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.
 
 ## Configuration Management
 *Configuration management tools.*
-- 
GitLab


From d3150d9c7878555b1f6f2a61d704b170518b2093 Mon Sep 17 00:00:00 2001
From: Stefan Schlesinger <sts@ono.at>
Date: Sun, 21 Dec 2014 11:47:14 +0100
Subject: [PATCH 026/193] Adding Capistrano and Mina to CI tools

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4b8f9cb..3da328b 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,8 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 *Continuous integration/deployment software.*
 
 * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
+* [Capistrano](http://www.capistranorb.com) - Reliably deploy your application to any number of machines simultaneously, in sequence or as a rolling set.
+* [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (like Capistrano but single script)
 * [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
 * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
 * [Go](http://www.go.cd/) - Open source continuous delivery server.
-- 
GitLab


From 5c3e761f85ed3f8f84bcdc72338b2641f970dc88 Mon Sep 17 00:00:00 2001
From: Stefan Schlesinger <sts@ono.at>
Date: Mon, 22 Dec 2014 06:39:06 +0100
Subject: [PATCH 027/193] New Category: Deployment Automation

Includes: Capistrano, Fabric, Mina, Rocketeer, Vlad the Deployer
---
 README.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3da328b..595e050 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,6 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Ansible](http://www.ansibleworks.com/) -  It's written in Python and manages the nodes over SSH.
 * [CFEngine](http://cfengine.com/) - Lightweight agent system. Configuration state is specified via a declarative language.
 * [Chef](http://www.opscode.com/chef/) - It's written in Ruby and Erlang and uses a pure-Ruby DSL.
-* [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
 * [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL.
 * [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL.
 * [Salt](http://www.saltstack.com/) - It's written in Python.
@@ -145,13 +144,19 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 *Continuous integration/deployment software.*
 
 * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
-* [Capistrano](http://www.capistranorb.com) - Reliably deploy your application to any number of machines simultaneously, in sequence or as a rolling set.
-* [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (like Capistrano but single script)
 * [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
 * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
 * [Go](http://www.go.cd/) - Open source continuous delivery server.
 * [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server.
-* [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation.
+
+## Deployment Automation
+*Tools and scripts to support deployments to your servers.*
+
+* [Capistrano](http://www.capistranorb.com) - Deploy your application to any number of machines simultaneously, in sequence or as a rolling set via SSH (rake based).
+* [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
+* [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (rake based).
+* [Rocketeer](http://rocketeer.autopergamene.eu/) - PHP task runner and deployment tool.
+* [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation (rake based).
 
 ## Distributed Filesystems
 *Network distributed filesystems.*
-- 
GitLab


From 87d38d4c359b09b631509e0894b134a1986c82bd Mon Sep 17 00:00:00 2001
From: Luca Steinke <phre4k@phre4k-573g.fritz.box>
Date: Tue, 23 Dec 2014 09:50:37 +0100
Subject: [PATCH 028/193] adding Taiga.io

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4b8f9cb..c48a977 100644
--- a/README.md
+++ b/README.md
@@ -411,6 +411,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [OpenProject](https://www.openproject.org) - Project collaboration with open source.
 * [Phabricator](http://phabricator.org/) Written in PHP.
 * [Redmine](http://www.redmine.org/) - Written in ruby on rails.
+* [Taiga](https://taiga.io/) - Agile, Free, Open Source Project Management Tool based on the Kanban and Scrum methods.
 * [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
 * [Trac](http://trac.edgewall.org/) - Written in python.
 
-- 
GitLab


From f0b8c87f1b8c60cd3e279c3d8ee6b79722fdb2c2 Mon Sep 17 00:00:00 2001
From: virtual-tdf <test@test.local>
Date: Wed, 4 Mar 2015 15:24:18 +0100
Subject: [PATCH 029/193] New category - Automation

I've added new category - automation and added 4 open source automation build tools. Some of them are should be know by sysadmins.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 4b8f9cb..5c1246e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 A curated list of amazingly awesome open source sysadmin resources inspired by [Awesome PHP](https://github.com/ziadoz/awesome-php)
 
 * [Awesome Sysadmin](#awesome-sysadmin)
+  * [Automation](#automation)
   * [Backups](#backups)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
@@ -51,6 +52,14 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [Websites](#websites)
 * [Contributing](#contributing)
 
+## Automation
+*Automation build.*
+
+* [GNU Make](http://www.amanda.org/) - The most popular automation build tool for many purposes.
+* [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
+* [Apache Ant](http://www.bacula.org/) - Automation build tool, similar to make, written in Java.
+* [Gradle](http://gradle.org/) - Another open source build automation system.
+
 ## Backups
 *Backup software.*
 
-- 
GitLab


From 2a42fcde53e95e3b3d5bcc0b428f3b1afb3ca771 Mon Sep 17 00:00:00 2001
From: virtual-tdf <test@test.local>
Date: Wed, 4 Mar 2015 15:32:19 +0100
Subject: [PATCH 030/193] Update to Automation category

Improved links and sorted list.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5c1246e..0e99524 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,9 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Automation
 *Automation build.*
 
-* [GNU Make](http://www.amanda.org/) - The most popular automation build tool for many purposes.
+* [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
 * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
-* [Apache Ant](http://www.bacula.org/) - Automation build tool, similar to make, written in Java.
+* [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
 * [Gradle](http://gradle.org/) - Another open source build automation system.
 
 ## Backups
-- 
GitLab


From 5809e3d938dfe4953a7a909cf46bcb5b4b5631ab Mon Sep 17 00:00:00 2001
From: Thomas <virtual-tdf@users.noreply.github.com>
Date: Thu, 5 Mar 2015 00:01:04 +0100
Subject: [PATCH 031/193] New app in WebMail category

I've added SquirellMail web-based IMAP client.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0e99524..7121413 100644
--- a/README.md
+++ b/README.md
@@ -468,6 +468,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
+* [SquirellMail](http://squirrelmail.org) - Another browser-based IMAP client.
 
 ## Web
 *Web servers.*
-- 
GitLab


From 33136ba52734b40e3a4653dcd2b496c611a80f12 Mon Sep 17 00:00:00 2001
From: Fotis Georgatos <kefalonia@gmail.com>
Date: Mon, 30 Mar 2015 12:43:29 +0100
Subject: [PATCH 032/193] added category: Build and software organization tools

Hi, this is heavy-handed in favor of things that relate to HPC, however there is no reason for not adding more bits there (such as autotools, cmake and the like)
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index c48a977..986f9a1 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,15 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Salt](http://www.saltstack.com/) - It's written in Python.
 * [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
 
+## Build and software organization tools
+*Build and software organization tools.*
+
+* [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
+* [environment-modules Tcl](http://en.wikipedia.org/wiki/Environment_Modules_%28software%29) - .
+* [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
+* [environment-modules Tcl/C](http://modules.sourceforge.net/) - The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
+* [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
+
 ## Continuous Integration & Continuous Deployment
 *Continuous integration/deployment software.*
 
-- 
GitLab


From 5da1d0c155e559ab5091f8417681a98c4fb4b096 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 04:33:56 +0200
Subject: [PATCH 033/193] fixed typo in Webmails/Squirrelmail

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3f4f95d..af7eea7 100644
--- a/README.md
+++ b/README.md
@@ -478,7 +478,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
-* [SquirellMail](http://squirrelmail.org) - Another browser-based IMAP client.
+* [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
 
 ## Web
 *Web servers.*
-- 
GitLab


From 864310f97429b56309322a0965169c581a002fee Mon Sep 17 00:00:00 2001
From: virtual-tdf <test@test.local>
Date: Wed, 4 Mar 2015 15:24:18 +0100
Subject: [PATCH 034/193] New category - Automation

I've added new category - automation and added 4 open source automation build tools. Some of them are should be know by sysadmins.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 986f9a1..8f33ab9 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 A curated list of amazingly awesome open source sysadmin resources inspired by [Awesome PHP](https://github.com/ziadoz/awesome-php)
 
 * [Awesome Sysadmin](#awesome-sysadmin)
+  * [Automation](#automation)
   * [Backups](#backups)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
@@ -51,6 +52,14 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [Websites](#websites)
 * [Contributing](#contributing)
 
+## Automation
+*Automation build.*
+
+* [GNU Make](http://www.amanda.org/) - The most popular automation build tool for many purposes.
+* [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
+* [Apache Ant](http://www.bacula.org/) - Automation build tool, similar to make, written in Java.
+* [Gradle](http://gradle.org/) - Another open source build automation system.
+
 ## Backups
 *Backup software.*
 
-- 
GitLab


From 51e60c1bca64dca3395c32d8873e8d64c8f052ad Mon Sep 17 00:00:00 2001
From: virtual-tdf <test@test.local>
Date: Wed, 4 Mar 2015 15:32:19 +0100
Subject: [PATCH 035/193] Update to Automation category

Improved links and sorted list.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8f33ab9..af5d531 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,9 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Automation
 *Automation build.*
 
-* [GNU Make](http://www.amanda.org/) - The most popular automation build tool for many purposes.
+* [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
 * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
-* [Apache Ant](http://www.bacula.org/) - Automation build tool, similar to make, written in Java.
+* [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
 * [Gradle](http://gradle.org/) - Another open source build automation system.
 
 ## Backups
-- 
GitLab


From 34b796493247ffef9c022afb2c3091ba5b93cd02 Mon Sep 17 00:00:00 2001
From: Thomas <virtual-tdf@users.noreply.github.com>
Date: Thu, 5 Mar 2015 00:01:04 +0100
Subject: [PATCH 036/193] New app in WebMail category

I've added SquirellMail web-based IMAP client.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index af5d531..3f4f95d 100644
--- a/README.md
+++ b/README.md
@@ -478,6 +478,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
+* [SquirellMail](http://squirrelmail.org) - Another browser-based IMAP client.
 
 ## Web
 *Web servers.*
-- 
GitLab


From f188451823874051b205ab2ce0e88f9838f25903 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 04:33:56 +0200
Subject: [PATCH 037/193] fixed typo in Webmails/Squirrelmail

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3f4f95d..af7eea7 100644
--- a/README.md
+++ b/README.md
@@ -478,7 +478,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
-* [SquirellMail](http://squirrelmail.org) - Another browser-based IMAP client.
+* [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
 
 ## Web
 *Web servers.*
-- 
GitLab


From 7ef8b18168ee48ac8b0072e6b2a4d7885e268226 Mon Sep 17 00:00:00 2001
From: Sam <sammcj@users.noreply.github.com>
Date: Fri, 13 Feb 2015 23:19:12 +1100
Subject: [PATCH 038/193] Add Prometheus

An open-source service monitoring system and time series database
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index af7eea7..ae3e4d8 100644
--- a/README.md
+++ b/README.md
@@ -284,6 +284,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [InfluxDB](http://influxdb.com/) - Open source distributed time series database with no external dependencies.
 * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
+* [Prometheus](http://prometheus.io/) - An open-source service monitoring system and time series database.
 * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
 
-- 
GitLab


From 4bdfce1d7f28e2d161af7d5e0b1ed35e759424c6 Mon Sep 17 00:00:00 2001
From: Bruno Paz <brunopaz@sapo.pt>
Date: Wed, 21 Jan 2015 19:28:07 +0000
Subject: [PATCH 039/193] added status pages section

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ae3e4d8..f03acb2 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [Software Containers](#software-containers)
   * [SSH](#ssh)
   * [Statistics](#statistics)
+  * [Status Pages](#statuspages)
   * [Ticketing systems](#ticketing-systems)
   * [Troubleshooting](#troubleshooting)
   * [Project Management](#project-management)
@@ -401,6 +402,11 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Piwik](http://piwik.org/) - Free and open source web analytics application.
 * [Webalizer](http://www.webalizer.org/) - Fast, free web server log file analysis program.
 
+## Status Pages
+
+* [StatusPage.io](http://www.statuspage.io) - Hosted Status Page Platform.
+* [Cachet](https://cachethq.io) - An open source status page system written in PHP.
+
 ## Ticketing systems
 *Web-based ticketing system.*
 
-- 
GitLab


From ec203fa9250c07f691c917822674a90ce52315c8 Mon Sep 17 00:00:00 2001
From: Bruno Paz <brunopaz@sapo.pt>
Date: Wed, 21 Jan 2015 19:29:48 +0000
Subject: [PATCH 040/193] fix TOC

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f03acb2..c12fe5e 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [Software Containers](#software-containers)
   * [SSH](#ssh)
   * [Statistics](#statistics)
-  * [Status Pages](#statuspages)
+  * [Status Pages](#status-pages)
   * [Ticketing systems](#ticketing-systems)
   * [Troubleshooting](#troubleshooting)
   * [Project Management](#project-management)
-- 
GitLab


From f25d284b985e7ea2e53672fa1afa9333a0891da6 Mon Sep 17 00:00:00 2001
From: Justin Garrison <justinleegarrison@gmail.com>
Date: Sat, 27 Dec 2014 14:44:59 -0800
Subject: [PATCH 041/193] Added trigger for network config management

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c12fe5e..929519a 100644
--- a/README.md
+++ b/README.md
@@ -295,6 +295,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
 * [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configurarion and maintain history of changes.
 * [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
+* [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
 
 ## Newsletters
 *Newsletter software.*
-- 
GitLab


From f8481d703f12b403dbf6e9c3f9fdadf539bc36c9 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 05:18:45 +0200
Subject: [PATCH 042/193] added Opsmatic as suggested by @iweizman

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 60c7fd9..ba514f5 100644
--- a/README.md
+++ b/README.md
@@ -274,6 +274,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
+* [Opsmatic](https://opsmatic.com/) - Configuration monitoring software for your infrastructure with automatic drift detection.
 * [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments.
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
-- 
GitLab


From f9e53ff5d872984399cf63f89f1756418b72ecf6 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 05:24:00 +0200
Subject: [PATCH 043/193] added QEMU to Virtualization as suggested by
 @mrvaldes

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 13b79c0..9c23de5 100644
--- a/README.md
+++ b/README.md
@@ -476,6 +476,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
+* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From 0a35489bbba902c6f8ff1821e99efad0fea5d92b Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 05:38:21 +0200
Subject: [PATCH 044/193] added stormssh to SSH as suggested by @mmonotone

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9c23de5..52321aa 100644
--- a/README.md
+++ b/README.md
@@ -412,6 +412,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
+* [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From 6b288e2f21daf2889b148a1fb7dc34ea9ab6f698 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 06:00:06 +0200
Subject: [PATCH 045/193] removed 'please' from contribution guidelines

---
 CONTRIBUTING.md | 11 ++++++++---
 README.md       |  5 +----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index db4b3d5..0637c1e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,10 +2,15 @@
 Please ensure your pull request adheres to the following guidelines:
 
 * This is an open source compilation, please check that the license of the software is suitable.
-* Please search previous suggestions before making a new one, as yours may be a duplicate.
-* Please make an individual pull request for each suggestion.
+* Search previous suggestions before making a new one, as yours may be a duplicate.
+* Make an individual commit for each suggestion.
+  * Consolidate multiple commits to a pull request.
+* In pull request descriptions:
+  * Don't use past tense or present progressive (added, adding)
+  * Include the application names and categories
+  * Example: *Add mosh, openSSH to SSH*
 * Use the following format: \[RESOURCE\]\(LINK\) - DESCRIPTION.
-* Keep descriptions short and simple.
+* Keep descriptions short.
 * End all descriptions with a full stop/period.
 * Order projects alphabetically within each category.
 * Check your spelling and grammar.
diff --git a/README.md b/README.md
index 52321aa..fc8dcec 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Awesome Sysadmin
-A curated list of amazingly awesome open source sysadmin resources inspired by [Awesome PHP](https://github.com/ziadoz/awesome-php)
+**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/bayandin/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
@@ -584,6 +584,3 @@ Various resources, such as books, websites and articles, for improving your skil
 
 * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
 * [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
-
-# Contributing
-Please see [CONTRIBUTING](https://github.com/kahun/awesome-sysadmin/blob/master/CONTRIBUTING.md) for details.
-- 
GitLab


From 339b92a7d7a603ac307d5631b4a5c88a05843477 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 06:22:31 +0200
Subject: [PATCH 046/193] restructured IMAP/POP/SMTP into new category 'Mail
 Servers' and added 'Mail Clients'

---
 README.md | 78 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index fc8dcec..b1a4d48 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,11 @@
   * [Distributed Filesystems](#distributed-filesystems)
   * [DNS](#dns)
   * [Hosting Control Panels](#hosting-control-panels)
-  * [IMAP/POP3](#imappop3)
   * [IT Asset Management](#it-asset-management)
   * [LDAP](#ldap)
   * [Log Management](#log-management)
+  * [Mail Clients](#mail-clients)
+  * [Mail Servers](#mail-servers)
   * [Monitoring](#monitoring)
   * [Metric & Metric Collection](#metric--metric-collection)
   * [Network Configuration Management](#network-configuration-management)
@@ -29,7 +30,6 @@
   * [RDBMS](#rdbms)
   * [Security](#security)
   * [Service Discovery](#service-discovery)
-  * [SMTP](#smtp)
   * [Software Containers](#software-containers)
   * [SSH](#ssh)
   * [Statistics](#statistics)
@@ -42,7 +42,6 @@
   * [VPN](#vpn)
   * [XMPP](#xmpp)
   * [Web](#web)
-  * [Webmails](#webmails)
   * [Wikis](#wikis)
 * [Resources](#resources)
   * [Blogs](#blogs)
@@ -138,7 +137,7 @@
 *Configuration management database (CMDB) software.*
 
 * [i-doit](http://www.i-doit.org/) - Open Source IT Documentation and CMDB.
-* [iTop](http://www.combodo.com/-Overview-.html) - A complete open source, ITIL, web based service management tool.
+* [iTop](http://www.combodo.com/-Overview-.html) - Complete open source, 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.
 * [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopedia toolkit (based on mediawiki).
 * [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.
@@ -220,14 +219,6 @@
 * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
 * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
 
-## IMAP/POP3
-*IMAP/POP3 mail servers.*
-
-* [Courier IMAP/POP3](http://www.courier-mta.org/imap/) - Fast, scalable, enterprise IMAP and POP3 server.
-* [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
-* [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
-* [Qpopper](http://www.eudora.com/products/unsupported/qpopper/) - One of the oldest and most popular server implementations of POP3.
-
 ## IT Asset Management
 *IT Assets Management software.*
 
@@ -259,6 +250,49 @@
 * [Logstash](http://logstash.net/) - Tool for managing events and logs.
 * [Octopussy](http://www.octopussy.pm) - Log Management Solution (Visualize / Alert / Report).
 
+## Mail Clients
+
+* [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
+* [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
+* [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
+
+### Webmail
+*Webmail applications.*
+
+* [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
+* [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
+* [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
+
+## Mail Servers
+*Software for setting up mail servers.*
+
+### MDA (IMAP/POP3)
+*Mail Delivery Agents (IMAP/POP3 software).*
+
+* [Courier IMAP/POP3](http://www.courier-mta.org/imap/) - Fast, scalable, enterprise IMAP and POP3 server.
+* [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
+* [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
+* [Qpopper](http://www.eudora.com/products/unsupported/qpopper/) - One of the oldest and most popular server implementations of POP3.
+
+### MTA (SMTP)
+*Mail Transfer Agents (SMTP servers).*
+
+* [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge.
+* [Haraka](http://haraka.github.io/) - A high-performance, pluginable SMTP server written in JavaScript.
+* [MailCatcher](http://mailcatcher.me/) - Ruby gem that deploys a simply SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development.
+* [Maildrop](https://github.com/m242/maildrop) - Open Source disposable email SMTP server, also useful for development.
+* [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project.
+* [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement.
+* [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
+* [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA).
+
+### complete solutions
+*Software for simple deployment of a mail server, e.g. for inexperienced or impatient admins.*
+
+* [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
+* [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot.
+
+
 ## Monitoring
 *Monitoring software.*
 
@@ -383,19 +417,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
 * [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
-## SMTP
-*SMTP servers.*
-
-* [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge.
-* [Haraka](http://haraka.github.io/) - A high-performance, pluginable SMTP server written in JavaScript.
-* [MailCatcher](http://mailcatcher.me/) - Ruby gem that deploys a simply SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development.
-* [Maildrop](https://github.com/m242/maildrop) - Open Source disposable email SMTP server, also useful for development.
-* [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project.
-* [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement.
-* [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
-* [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA).
-* [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
-
 ## Software Containers
 *Operating system–level virtualization.*
 
@@ -502,13 +523,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
 * [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
 
-## Webmails
-*Webmail applications.*
-
-* [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
-* [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
-* [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
-
 ## Web
 *Web servers.*
 
-- 
GitLab


From d36c1e94e34761b6b614c57616aa97b887539d5f Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 06:26:07 +0200
Subject: [PATCH 047/193] added AlternativeTo to 'Software Repositories', moved
 'Editors' to the list at the top

---
 README.md | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b1a4d48..e08563c 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@
   * [Continuous Integration & Continuous Deployment](#continuous-integration--continuous-deployment)
   * [Distributed Filesystems](#distributed-filesystems)
   * [DNS](#dns)
+  * [Editors](#editors)
   * [Hosting Control Panels](#hosting-control-panels)
   * [IT Asset Management](#it-asset-management)
   * [LDAP](#ldap)
@@ -46,7 +47,6 @@
 * [Resources](#resources)
   * [Blogs](#blogs)
   * [Books](#books)
-  * [Editors](#editors)
   * [Newsletters](#newsletters)
   * [Repositories](#repositories)
   * [Websites](#websites)
@@ -209,6 +209,22 @@
 * [Unbound](http://unbound.net/) - Validating, recursive, and caching DNS resolver.
 * [Yadifa](http://yadifa.eu/) - Lightweight authoritative Name Server with DNSSEC capabilities powering the .eu top-level domain.
 
+## Editors
+*Open source code editors.*
+
+* [Atom](https://atom.io/) - A hackable text editor from Github.
+* [Brackets](http://brackets.io/) - Open source code editor for web designers and front-end developers.
+* [Eclipse](http://eclipse.org/) - IDE written in Java with an extensible plug-in system.
+* [Geany](http://www.geany.org/) - GTK2 text editor.
+* [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
+* [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
+* [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
+* [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing.
+* [Light Table](http://www.lighttable.com/) - The next generation code editor.
+* [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
+* [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.
+
 ## Hosting Control Panels
 *Web hosting control panels*
 
@@ -567,22 +583,6 @@ Various resources, such as books, websites and articles, for improving your skil
 * [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
 * [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
 
-## Editors
-*Open source code editors.*
-
-* [Atom](https://atom.io/) - A hackable text editor from Github.
-* [Brackets](http://brackets.io/) - Open source code editor for web designers and front-end developers.
-* [Eclipse](http://eclipse.org/) - IDE written in Java with an extensible plug-in system.
-* [Geany](http://www.geany.org/) - GTK2 text editor.
-* [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
-* [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
-* [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
-* [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing.
-* [Light Table](http://www.lighttable.com/) - The next generation code editor.
-* [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
-* [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.
-
 ## Newsletters
 
 * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
@@ -590,6 +590,7 @@ Various resources, such as books, websites and articles, for improving your skil
 ## Repositories
 *Software package repositories.*
 
+* [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
 * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
 * [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
 
-- 
GitLab


From 4256df65c3a215848e2e94337d654f6dd3bc4f39 Mon Sep 17 00:00:00 2001
From: phre4k <phre4k@phre4k-573g.fritz.box>
Date: Sat, 4 Apr 2015 06:42:58 +0200
Subject: [PATCH 048/193] added pfSense firewall to 'Security'

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e08563c..78b6f39 100644
--- a/README.md
+++ b/README.md
@@ -424,6 +424,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
 
-- 
GitLab


From 87a8986a8d95af9dfdcba69a59a94693a5622c1d Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 4 Apr 2015 08:45:19 +0200
Subject: [PATCH 049/193] added LXC (suggestion from @vermaden)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 78b6f39..6c3c595 100644
--- a/README.md
+++ b/README.md
@@ -439,6 +439,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Bitnami](https://bitnami.com/) - Produces open source installers or software packages for web applications and development stacks as well as virtual appliances.
 * [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
+* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
-- 
GitLab


From b8476c49f5cd3cf5731fb6c1af861442b22d74ca Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 4 Apr 2015 08:50:01 +0200
Subject: [PATCH 050/193] added Froxlor, Sentora, Webmin to Hosting Control
 Panels

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 6c3c595..1e0cb0c 100644
--- a/README.md
+++ b/README.md
@@ -230,9 +230,12 @@
 
 * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
 * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
+* [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+* [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
 * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
+* [Webmin](http://www.webmin.com/) - Linux server control panel.
 * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
 
 ## IT Asset Management
-- 
GitLab


From e6b5d4d7e33c5e68f2d61540122554640f38ca8a Mon Sep 17 00:00:00 2001
From: Steven Huang <stevenhuang1995@gmail.com>
Date: Sat, 4 Apr 2015 01:43:14 -0700
Subject: [PATCH 051/193] Add freeboard to Monitoring

This is a great data viewer that's originally intended to easily display sensor data from IoT devices, but we have been using this in-house for a while to show disparate JSON data and it has been a joy to use.

Check out the demos at http://freeboard.io/ and see for yourself!
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1e0cb0c..7fe4ff5 100644
--- a/README.md
+++ b/README.md
@@ -319,6 +319,7 @@
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [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.
+* [freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI. View component of MVC.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
-- 
GitLab


From 2c3b829486b267d8aa78605eacaef9f28db71368 Mon Sep 17 00:00:00 2001
From: Steven Huang <stevenhuang1995@gmail.com>
Date: Sat, 4 Apr 2015 01:47:30 -0700
Subject: [PATCH 052/193] Changed Freeboard category

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7fe4ff5..7c11823 100644
--- a/README.md
+++ b/README.md
@@ -319,7 +319,6 @@
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [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.
-* [freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI. View component of MVC.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
@@ -347,6 +346,7 @@
 * [Collectl](http://collectl.sourceforge.net/) - High precision system performance metrics collecting tool.
 * [Dashing](http://dashing.io/) - Ruby gem that allows for rapid statistical dashboard development. An all HTML5 approach allows for big screen displays in data centers or conference rooms.
 * [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
+* [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI.
 * [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
 * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
 * [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scaleable graphing server.
-- 
GitLab


From 9afb2100104678e9c2021cb9fb4737e631258578 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 4 Apr 2015 12:29:36 +0200
Subject: [PATCH 053/193] tried out relative link to awesome-awesomeness

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1e0cb0c..7b4a6a8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Awesome Sysadmin
-**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/bayandin/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
+**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](../awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
-- 
GitLab


From 54aaece303819d26313ce4511370b0e8c33173db Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 4 Apr 2015 12:30:40 +0200
Subject: [PATCH 054/193] Revert "tried out relative link to
 awesome-awesomeness"

This reverts commit 9afb2100104678e9c2021cb9fb4737e631258578.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b4a6a8..1e0cb0c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Awesome Sysadmin
-**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](../awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
+**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/bayandin/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
-- 
GitLab


From 109666e8e0ccd8b43eff876a18bfc7d798aacd8a Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 4 Apr 2015 12:32:18 +0200
Subject: [PATCH 055/193] linked to n1trux/awesome-awesomeness in the
 introduction

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1e0cb0c..67dcc78 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Awesome Sysadmin
-**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/bayandin/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
+**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/n1trux/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
-- 
GitLab


From 75dd31c7f8df7354c334dd590842aa0a60d0bb08 Mon Sep 17 00:00:00 2001
From: Crack Duck <n1trux@users.noreply.github.com>
Date: Sat, 4 Apr 2015 12:43:09 +0200
Subject: [PATCH 056/193] clarified language, removed more please

---
 CONTRIBUTING.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0637c1e..041be79 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,19 +1,22 @@
 # Contribution Guidelines
-Please ensure your pull request adheres to the following guidelines:
+Ensure your pull request adheres to the following guidelines:
 
-* This is an open source compilation, please check that the license of the software is suitable.
-* Search previous suggestions before making a new one, as yours may be a duplicate.
-* Make an individual commit for each suggestion.
+* This is an open source compilation.
+  * Check the license of the software is suitable.
+* Search previous suggestions before making a new one.
+  * Don't create duplicates.
+* Make an individual commit for each category.
   * Consolidate multiple commits to a pull request.
 * In pull request descriptions:
-  * Don't use past tense or present progressive (added, adding)
-  * Include the application names and categories
+  * Use imperative (e.g. add instead of added/adding).
+  * Include application names and categories.
+  * Include a link to the open source project page.
   * Example: *Add mosh, openSSH to SSH*
 * Use the following format: \[RESOURCE\]\(LINK\) - DESCRIPTION.
-* Keep descriptions short.
-* End all descriptions with a full stop/period.
+  * Keep descriptions short.
+  * End descriptions with a full stop/period.
 * Order projects alphabetically within each category.
-* Check your spelling and grammar.
-* New categories, or improvements to the existing categorisation are welcome.
+* Check spelling and grammar.
+* Improvements to the existing categorisation are welcome.
 
-Thank you for your suggestions!
+Thank you very much for your suggestions!
-- 
GitLab


From 5d9b8d5f0e8dba610634b530367c9b74d122dcb3 Mon Sep 17 00:00:00 2001
From: Spencer Owen <owenspencer@gmail.com>
Date: Sat, 4 Apr 2015 17:10:23 -0600
Subject: [PATCH 057/193] Add Apache Kafka

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e948c71..e6501d7 100644
--- a/README.md
+++ b/README.md
@@ -406,6 +406,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
 * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
+* [Kafka](http://kafka.apache.org) - Extreemly high performance publish/subscribe message system.
 * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
 * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
 * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
-- 
GitLab


From 23347591fd471edd6e10940dfc5dc770b02395b1 Mon Sep 17 00:00:00 2001
From: Geoffrey Anderson <geoff@geoffreyanderson.net>
Date: Sat, 4 Apr 2015 22:29:41 -0700
Subject: [PATCH 058/193] New category - ChatOps

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 4b8f9cb..ce5403d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Backups](#backups)
+  * [ChatOps](#chatops)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
   * [Cloud Storage](#cloud-storage)
@@ -67,6 +68,14 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
 
+## ChatOps
+*Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
+
+* [Eggdrop](http://www.eggheads.org/) - the world's most popular Open Source IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
+* [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
+* [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
+* [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
+
 ## Cloning
 *Cloning software.*
 
-- 
GitLab


From af8a7f71848550cfaa8b2e6dfc85f5cf122f3861 Mon Sep 17 00:00:00 2001
From: Geoffrey Anderson <geoff@geoffreyanderson.net>
Date: Sat, 4 Apr 2015 22:33:15 -0700
Subject: [PATCH 059/193] Adding lazlo to ChatOps category

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ce5403d..1ac763f 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Eggdrop](http://www.eggheads.org/) - the world's most popular Open Source IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
 * [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
 * [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
+* [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
 * [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
 
 ## Cloning
-- 
GitLab


From 5d3ef3f29bf042fcc2fd27fe29f008b376cd8b8a Mon Sep 17 00:00:00 2001
From: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sun, 5 Apr 2015 12:20:47 +0100
Subject: [PATCH 060/193] Link update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e6501d7..8bb1f97 100644
--- a/README.md
+++ b/README.md
@@ -389,7 +389,7 @@
   * [FlockDB](https://github.com/twitter/flockdb) - Twitter's distributed, fault-tolerant graph database.
   * [Neo4j](http://www.neo4j.org/) - Open source graph database.
 * Key-Value
-  * [LevelDB](https://code.google.com/p/leveldb/) - Google's high performance key/value database.
+  * [LevelDB](https://github.com/google/leveldb) - Google's high performance key/value database.
   * [Redis](http://redis.io/) - Networked, in-memory, key-value data store with optional durability.
   * [Riak](http://basho.com/riak/) - Another fault-tolerant key-value NoSQL database.
 
-- 
GitLab


From c5494c5a636de6750ea66a69247e2d360de24e8b Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sun, 5 Apr 2015 13:56:08 +0200
Subject: [PATCH 061/193] trying to clarify contribution guidelines

---
 CONTRIBUTING.md | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 041be79..def4ecb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,22 +1,22 @@
 # Contribution Guidelines
-Ensure your pull request adheres to the following guidelines:
 
-* This is an open source compilation.
-  * Check the license of the software is suitable.
+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*.
+
+## Commits
 * Search previous suggestions before making a new one.
-  * Don't create duplicates.
+* 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.
-  * Consolidate multiple commits to a pull request.
-* In pull request descriptions:
-  * Use imperative (e.g. add instead of added/adding).
-  * Include application names and categories.
-  * Include a link to the open source project page.
-  * Example: *Add mosh, openSSH to SSH*
-* Use the following format: \[RESOURCE\]\(LINK\) - DESCRIPTION.
-  * Keep descriptions short.
-  * End descriptions with a full stop/period.
-* Order projects alphabetically within each category.
-* Check spelling and grammar.
-* Improvements to the existing categorisation are welcome.
+  * Order projects alphabetically.
+  * Consolidate multiple commits.
+  
+## Pull Requests
+* 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.
 
-Thank you very much for your suggestions!
+## Issues
+* Discussion, questions and bug reports only.
+* If you are sure software meets the guidelines, create a Pull Request (see above).
+* Check spelling and grammar.
+* Suggestions for improvements to existing structure are welcome.
-- 
GitLab


From 16f659874a756bc1c56e312e290d147be950eb12 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sun, 5 Apr 2015 14:00:25 +0200
Subject: [PATCH 062/193] added OWA to and shortened descriptions in Statistics

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e948c71..0192361 100644
--- a/README.md
+++ b/README.md
@@ -460,11 +460,12 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Statistics
 *Analytics software.*
 
-* [Analog](http://www.analog.cx/) - The most popular logfile analyser in the world.
-* [GoAccess](http://goaccess.io/) - Open source real-time web log analyzer and interactive viewer that runs in a terminal.
-* [Piwik](http://piwik.org/) - Free and open source web analytics application.
-* [AWStats](http://www.awstats.org/) - free powerful and featureful tool that generates advanced web, streaming, ftp or mail server statistics, graphically
-* [Webalizer](http://www.webalizer.org/) - Fast, free web server log file analysis program.
+* [Analog](http://www.analog.cx/) - Logfile Analyser.
+* [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
+* [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
+* [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
+* [Piwik](http://piwik.org/) - Web analytics application.
+* [Webalizer](http://www.webalizer.org/) - Fast web server log file analysis.
 
 ## Status Pages
 
-- 
GitLab


From ab6d565a137f095d8be00587295b407c0d81caed Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sun, 5 Apr 2015 14:05:12 +0200
Subject: [PATCH 063/193] shortened descriptions in Ticketing systems

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b53720b..e39b529 100644
--- a/README.md
+++ b/README.md
@@ -477,13 +477,13 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Web-based ticketing system.*
 
 * [Bugzilla](http://www.bugzilla.org/) - General-purpose bugtracker and testing tool originally developed and used by the Mozilla project.
-* [Cerb](http://www.cerberusweb.com/) - A group-based e-mail management project built with a commercial open source license.
+* [Cerb](http://www.cerberusweb.com/) - Group-based e-mail management project.
 * [Flyspray](http://flyspray.org) - Web-based bug tracking system written in PHP.
-* [MantisBT](http://www.mantisbt.org/) - Another web-based bug tracking system.
-* [osTicket](http://osticket.com/) - Open source support ticket system.
-* [Otrs](http://www.otrs.com/) - A free and open-source trouble ticket system software package that a company, organization, or other entity can use to assign tickets to incoming queries and track further communications about them.
+* [MantisBT](http://www.mantisbt.org/) - Web-based bug tracking system.
+* [osTicket](http://osticket.com/) - Simple support ticket system.
+* [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications.
 * [Request Tracker](http://www.bestpractical.com/rt/) - Ticket-tracking system written in Perl.
-* [TheBugGenie](http://www.thebuggenie.com) - Open source ticket system with extremely complete users rights granularity.
+* [TheBugGenie](http://www.thebuggenie.com) - Ticket system with extensive user rights system.
 
 ## Troubleshooting
 *Troubleshooting Tools.*
-- 
GitLab


From ceffae4ff883dd9ccd9f50eb42f872805844accf Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sun, 5 Apr 2015 16:30:17 +0200
Subject: [PATCH 064/193] removed Opsmatic (not FLOSS)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 1e64735..599939a 100644
--- a/README.md
+++ b/README.md
@@ -328,7 +328,6 @@
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
-* [Opsmatic](https://opsmatic.com/) - Configuration monitoring software for your infrastructure with automatic drift detection.
 * [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments.
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
-- 
GitLab


From 09cdb400635fb72664394e49ffa8c31e34e3f509 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sun, 5 Apr 2015 20:34:33 +0200
Subject: [PATCH 065/193] added Snebu to Backup - closes #5

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 599939a..5d70878 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,7 @@
 * [Lsyncd](https://github.com/axkibe/lsyncd) - Watches a local directory trees for changes, and then spawns a process to synchronize the changes. Uses rsync by default.
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
+* [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
 * [TarSnap](https://www.tarsnap.com/) - Secure backup service with an open-source client.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
-- 
GitLab


From 02e5e3410f3c275a883b527eb3d39191ef0605c2 Mon Sep 17 00:00:00 2001
From: Andrew Widdersheim <awiddersheim@hotmail.com>
Date: Sun, 5 Apr 2015 20:44:57 -0400
Subject: [PATCH 066/193] Add OSSEC

OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5d70878..22d96f5 100644
--- a/README.md
+++ b/README.md
@@ -429,6 +429,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [OSSEC](http://ossec.net) - OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
-- 
GitLab


From c03fc908380553315f7546b7468b22dcc504c808 Mon Sep 17 00:00:00 2001
From: Jaseem Abid <j@ideadevice.com>
Date: Mon, 6 Apr 2015 06:15:22 +0530
Subject: [PATCH 067/193] Add phabricator to code review tools.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5d70878..d37f1c6 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@
 *Web Based collaborative code review system.*
 
 * [Gerrit](https://code.google.com/p/gerrit/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
+* [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
 * [Review Board](https://www.reviewboard.org/) - Available as free software uner the MIT License.
 
 ## Collaborative Software
-- 
GitLab


From 3220d06f33bdfa7e6ebf53783e85f0962b62e527 Mon Sep 17 00:00:00 2001
From: Rilindo Foster <rilindo.foster@monzell.com>
Date: Sun, 5 Apr 2015 20:40:21 -0500
Subject: [PATCH 068/193] Added Repos

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 5d70878..016cf17 100644
--- a/README.md
+++ b/README.md
@@ -601,6 +601,9 @@ Various resources, such as books, websites and articles, for improving your skil
 * [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
 * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
 * [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
+* [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
+* [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
+* [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
 
 ## Websites
 *Useful sysadmin related websites.*
-- 
GitLab


From 718589d3118bedba5fadfae8e9f2563bb0bcb02f Mon Sep 17 00:00:00 2001
From: Petros Moisiadis <ernest0x@yahoo.gr>
Date: Mon, 6 Apr 2015 10:17:07 +0300
Subject: [PATCH 069/193] Add Attic to Backup software

Attic is a deduplicating backup program written in Python.
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d70878..de00a84 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@
 *Backup software.*
 
 * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
+* [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
 * [Bacula](http://www.bacula.org) - Another Client-server model backup tool.
 * [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
 * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
@@ -77,7 +78,7 @@
 * [TarSnap](https://www.tarsnap.com/) - Secure backup service with an open-source client.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
-* [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool
+* [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
 
 ## Cloning
 *Cloning software.*
-- 
GitLab


From 2ee2fe13e9006413823e85692f68e2b3f50982b9 Mon Sep 17 00:00:00 2001
From: Vyacheslav Shevchenko <bliz937@gmail.com>
Date: Mon, 6 Apr 2015 10:53:53 +0200
Subject: [PATCH 070/193] Added sshrc

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5d70878..cb03952 100644
--- a/README.md
+++ b/README.md
@@ -457,6 +457,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
 * [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
+* [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From a37db0265db23c5108a06f5a1b7ba18f1f36d747 Mon Sep 17 00:00:00 2001
From: Vyacheslav Shevchenko <bliz937@gmail.com>
Date: Mon, 6 Apr 2015 10:55:19 +0200
Subject: [PATCH 071/193] fixed wrong placement

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cb03952..e8fbfa0 100644
--- a/README.md
+++ b/README.md
@@ -456,8 +456,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
-* [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
 * [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
+* [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
 
 ## Statistics
 *Analytics software.*
-- 
GitLab


From f66aaaaf0a251f127d6e353d6cf55c963f083b80 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 6 Apr 2015 11:10:03 +0200
Subject: [PATCH 072/193] created sub-categories for Repositories

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 016cf17..0937db0 100644
--- a/README.md
+++ b/README.md
@@ -599,11 +599,15 @@ Various resources, such as books, websites and articles, for improving your skil
 *Software package repositories.*
 
 * [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
+
+### Debian-based distributions
 * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
-* [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
+
+### RPM-based distributions
+* [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
 * [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
+* [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
 * [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
-* [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
 
 ## Websites
 *Useful sysadmin related websites.*
-- 
GitLab


From a86e1ec8a7134db0b67de6cf7ed1d4bbdb6e886f Mon Sep 17 00:00:00 2001
From: doertyDoerte! <stefan.staudenmeyer@csiweb.de>
Date: Mon, 6 Apr 2015 11:30:38 +0200
Subject: [PATCH 073/193] Add Security -> Glastopf

[Glastopf](http://glastopf.org/) is a low interaction honeypot system which emulates vulnerabiltiies to gather data and make sense of the attacks that try to get into your system.
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a116698..51fedd3 100644
--- a/README.md
+++ b/README.md
@@ -433,7 +433,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
-* [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
+* [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
+* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
 
 ## Service Discovery
 
-- 
GitLab


From 8a43dd824873242b93e39eec1228732073a51e74 Mon Sep 17 00:00:00 2001
From: doertyDoerte! <stefan.staudenmeyer@csiweb.de>
Date: Mon, 6 Apr 2015 11:36:06 +0200
Subject: [PATCH 074/193] Add Security -> Kippo

[Kippo](https://github.com/desaster/kippo) is a cool sandbox, a standalone SSH daemon that can stand besides "the real" SSH daemon listening on another port, giving a sysadmin the ability to configure a whole FS sandbox.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 51fedd3..11960f6 100644
--- a/README.md
+++ b/README.md
@@ -435,6 +435,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
 * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
+* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
 
 ## Service Discovery
 
-- 
GitLab


From 1753ee4c3aa7e8147c7212a2e4d87042249dd8bb Mon Sep 17 00:00:00 2001
From: doertyDoerte! <stefan.staudenmeyer@csiweb.de>
Date: Mon, 6 Apr 2015 11:57:29 +0200
Subject: [PATCH 075/193] Security: Updated to alphabetical

Relates to the following additions:

* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 11960f6..984aa06 100644
--- a/README.md
+++ b/README.md
@@ -431,11 +431,11 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
+* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
-* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
-* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
 
 ## Service Discovery
 
-- 
GitLab


From 100b927b793bfec3e3bffce32ed77c4d1c392ea1 Mon Sep 17 00:00:00 2001
From: Andrew Widdersheim <awiddersheim@hotmail.com>
Date: Mon, 6 Apr 2015 08:52:43 -0400
Subject: [PATCH 076/193] Shorten OSSEC description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22d96f5..6340d16 100644
--- a/README.md
+++ b/README.md
@@ -429,7 +429,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
-* [OSSEC](http://ossec.net) - OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response.
+* [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection techniques.
-- 
GitLab


From 7338756747852e393170dfa686d98bbc082c7631 Mon Sep 17 00:00:00 2001
From: Francois-Guillaume Ribreau <github@fgribreau.com>
Date: Mon, 6 Apr 2015 15:04:27 +0200
Subject: [PATCH 077/193] Remove statuspage.io, fixes #20

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c643e72..53a98dc 100644
--- a/README.md
+++ b/README.md
@@ -473,7 +473,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Status Pages
 
-* [StatusPage.io](http://www.statuspage.io) - Hosted Status Page Platform.
 * [Cachet](https://cachethq.io) - An open source status page system written in PHP.
 
 ## Ticketing systems
-- 
GitLab


From 8ddc79545dabc896cd359ab9b2ab2d1082910f9f Mon Sep 17 00:00:00 2001
From: Francois-Guillaume Ribreau <github@fgribreau.com>
Date: Mon, 6 Apr 2015 15:05:19 +0200
Subject: [PATCH 078/193] Remove bitnami which is not a Open Source software

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c643e72..eacfab4 100644
--- a/README.md
+++ b/README.md
@@ -444,7 +444,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Software Containers
 *Operating system–level virtualization.*
 
-* [Bitnami](https://bitnami.com/) - Produces open source installers or software packages for web applications and development stacks as well as virtual appliances.
 * [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
 * [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
-- 
GitLab


From 5632df006d88cfb90f9d282d76c0f4c05f7a8f1e Mon Sep 17 00:00:00 2001
From: Duncan Lock <duncan.lock@gmail.com>
Date: Mon, 6 Apr 2015 12:26:53 -0700
Subject: [PATCH 079/193] Spelling Corrections

Spellcheck pass, correcting several mistakes.
Not touched anything debatable - hyphenation, en_US/GB, capitalization etc..
---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 029c02b..9279620 100644
--- a/README.md
+++ b/README.md
@@ -117,14 +117,14 @@
 * [Seafile](http://seafile.com) - Another Open Source Cloud Storage solution.
 * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
 * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-* [Syncthing](http://syncthing.net/) - Open Source system for private, encrypted and authenticated distrobution of data.
+* [Syncthing](http://syncthing.net/) - Open Source system for private, encrypted and authenticated distribution of data.
 
 ## Code Review
 *Web Based collaborative code review system.*
 
 * [Gerrit](https://code.google.com/p/gerrit/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
 * [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
-* [Review Board](https://www.reviewboard.org/) - Available as free software uner the MIT License.
+* [Review Board](https://www.reviewboard.org/) - Available as free software under the MIT License.
 
 ## Collaborative Software
 *Collaborative software or groupware suites.*
@@ -142,7 +142,7 @@
 * [i-doit](http://www.i-doit.org/) - Open Source IT Documentation and CMDB.
 * [iTop](http://www.combodo.com/-Overview-.html) - Complete open source, 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.
-* [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopedia toolkit (based on mediawiki).
+* [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopaedia toolkit (based on mediawiki).
 * [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.
 
@@ -188,7 +188,7 @@
 *Network distributed filesystems.*
 
 * [Ceph](http://ceph.com/) - Distributed object store and file system.
-* [DRBD](http://www.drbd.org/) - Disributed Replicated Block Device.
+* [DRBD](http://www.drbd.org/) - Distributed Replicated Block Device.
 * [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
 * [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
 * [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
@@ -336,7 +336,7 @@
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
 * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
-* [Thruk](http://www.thruk.org/) - Multibackend monitoring webinterface with support for Naemon, Nagios, Icinga and Shinken.
+* [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
 * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
 * [Zabbix](http://www.zabbix.com/) - Enterprise-class software for monitoring of networks and applications.
 * [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.
@@ -351,7 +351,7 @@
 * [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI.
 * [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
 * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
-* [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scaleable graphing server.
+* [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scalable graphing server.
 * [InfluxDB](http://influxdb.com/) - Open source distributed time series database with no external dependencies.
 * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
@@ -363,8 +363,8 @@
 *Network configuration management tools.*
 
 * [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
-* [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interace and GIT storage.
-* [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configurarion and maintain history of changes.
+* [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interface and GIT storage.
+* [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configuration and maintain history of changes.
 * [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
 * [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
 
@@ -408,7 +408,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
 * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
-* [Kafka](http://kafka.apache.org) - Extreemly high performance publish/subscribe message system.
+* [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
 * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
 * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
 * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
@@ -428,7 +428,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Security
 *Security tools.*
 
-* [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Privides tooling to automatically encrypt secrets like passwords.
+* [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
-- 
GitLab


From 9c94e9dbf42d5165653fe6c7c99167c9485dd349 Mon Sep 17 00:00:00 2001
From: Jens Jahnke <jan0sch@gmx.net>
Date: Wed, 8 Apr 2015 08:14:16 +0200
Subject: [PATCH 080/193] Add link to `fwknop`

The `fwknop` tool is very useful to protect services on servers via
single packet authorization.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0c6ffa1..7b13e80 100644
--- a/README.md
+++ b/README.md
@@ -442,6 +442,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+* [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
 * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
 * [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
 * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
-- 
GitLab


From e1eb707555ac3e6d9a78a12853204a3e2438a503 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 8 Apr 2015 10:23:08 +0200
Subject: [PATCH 081/193] added Cockpit, restructured Control Panels, closes
 #27

---
 README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 0c6ffa1..b4273ec 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@
   * [Configuration Management Database](#configuration-management-database)
   * [Configuration Management](#configuration-management)
   * [Continuous Integration & Continuous Deployment](#continuous-integration--continuous-deployment)
+  * [Control Panels](#control-panels)
   * [Distributed Filesystems](#distributed-filesystems)
   * [DNS](#dns)
   * [Editors](#editors)
-  * [Hosting Control Panels](#hosting-control-panels)
   * [IT Asset Management](#it-asset-management)
   * [LDAP](#ldap)
   * [Log Management](#log-management)
@@ -185,6 +185,20 @@
 * [Go](http://www.go.cd/) - Open source continuous delivery server.
 * [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server.
 
+## Control Panels
+*Web hosting and server control panels*
+
+* [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
+* [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
+* [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
+* [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
+* [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+* [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
+* [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
+* [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
+* [Webmin](http://www.webmin.com/) - Linux server control panel.
+* [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
+
 ## Deployment Automation
 *Tools and scripts to support deployments to your servers.*
 
@@ -238,19 +252,6 @@
 * [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.
 
-## Hosting Control Panels
-*Web hosting control panels*
-
-* [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
-* [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
-* [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-* [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
-* [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
-* [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-* [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
-* [Webmin](http://www.webmin.com/) - Linux server control panel.
-* [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
-
 ## IT Asset Management
 *IT Assets Management software.*
 
-- 
GitLab


From e2bd1722d2b46e743126f6c6686fcb8b80a8ef59 Mon Sep 17 00:00:00 2001
From: Jonas Friedmann <j@frd.mn>
Date: Thu, 9 Apr 2015 12:21:14 +0200
Subject: [PATCH 082/193] Add CloudBot

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5ed83b5..46d697f 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@
 ## ChatOps
 *Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
 
+* [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable, open-source Python IRC bot.
 * [Eggdrop](http://www.eggheads.org/) - the world's most popular Open Source IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
 * [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
 * [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
-- 
GitLab


From 3abf5b4f63dcd7b6ea7ec572bf27239d80621496 Mon Sep 17 00:00:00 2001
From: Calinou <calinou@opmbx.org>
Date: Thu, 9 Apr 2015 13:05:50 +0200
Subject: [PATCH 083/193] Add CC BY-SA 4.0 International license

---
 LICENSE.txt | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md   |   6 +++
 2 files changed, 110 insertions(+)
 create mode 100644 LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..92de3a9
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,104 @@
+## Creative Commons Attribution-ShareAlike 4.0 International Public License
+<http://creativecommons.org/licenses/by-sa/4.0/>
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 – Definitions.
+
+    Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+    Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+    BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
+    Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+    Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+    Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+    License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+    Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+    Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+    Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+    Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+    Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+    You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+Section 2 – Scope.
+
+    License grant.
+        Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+            reproduce and Share the Licensed Material, in whole or in part; and
+            produce, reproduce, and Share Adapted Material.
+        Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+        Term. The term of this Public License is specified in Section 6(a).
+        Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+        Downstream recipients.
+            Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+            Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+            No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+        No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+    Other rights.
+        Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+        Patent and trademark rights are not licensed under this Public License.
+        To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+    Attribution.
+
+        If You Share the Licensed Material (including in modified form), You must:
+            retain the following if it is supplied by the Licensor with the Licensed Material:
+                identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+                a copyright notice;
+                a notice that refers to this Public License;
+                a notice that refers to the disclaimer of warranties;
+                a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+            indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+            indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+        You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+        If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+    ShareAlike.
+
+    In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+        The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+        You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+        You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+    for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+    if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+    You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+    Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+    To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+
+    The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 – Term and Termination.
+
+    This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+    Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+        automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+        upon express reinstatement by the Licensor.
+    For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+    For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+    Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 – Other Terms and Conditions.
+
+    The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+    Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+Section 8 – Interpretation.
+
+    For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+    To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+    No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+    Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
diff --git a/README.md b/README.md
index 5ed83b5..cff572d 100644
--- a/README.md
+++ b/README.md
@@ -633,3 +633,9 @@ Various resources, such as books, websites and articles, for improving your skil
 
 * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
 * [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
+
+## License
+
+![cc license](http://i.creativecommons.org/l/by-sa/4.0/88x31.png)
+
+This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International](http://creativecommons.org/licenses/by-sa/4.0/) license.
-- 
GitLab


From d9d7075ee85e3067606bce38fab0438e60a3d7ba Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Thu, 9 Apr 2015 15:04:44 +0200
Subject: [PATCH 084/193] added advanced-ssh-config (@mgarces in kahun/pr/268)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8e71847..bd0ff56 100644
--- a/README.md
+++ b/README.md
@@ -469,6 +469,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## SSH
 *SSH tools.*
 
+* [Advanced SSH config](https://pypi.python.org/pypi/advanced-ssh-config/) - Enhances ssh_config file capabilities, completely transparent.
 * [autossh](http://www.harding.motd.ca/autossh/) - Automatically respawn ssh session after network interruption.
 * [Cluster SSH](http://sourceforge.net/projects/clusterssh/) - Controls a number of xterm windows via a single graphical console.
 * [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
-- 
GitLab


From 7c607f5b71878871bfaf0c26ef94779bff5ec6eb Mon Sep 17 00:00:00 2001
From: Steven Bambling <smbambling@gmail.com>
Date: Thu, 9 Apr 2015 09:14:51 -0400
Subject: [PATCH 085/193] add MDwiki

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bd0ff56..bb4d207 100644
--- a/README.md
+++ b/README.md
@@ -589,6 +589,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [DokuWiki](https://www.dokuwiki.org/dokuwiki) - Simple to use and highly versatile wiki that doesn't require a database.
 * [Gollum](https://github.com/gollum/gollum) - A simple, Git-powered wiki with a sweet API and local frontend.
 * [ikiwiki](http://ikiwiki.info/) - A wiki compiler.
+* [MDwiki](http://dynalon.github.io/mdwiki/#!index.md) - Wiki completely built in HTML5/Javascript and runs 100% on the client
 * [Mediawiki](http://www.mediawiki.org/wiki/MediaWiki) - Used to power Wikipedia.
 * [MoinMoin](http://moinmo.in/) - An advanced, easy to use and extensible WikiEngine with a large community of users.
 * [ÅŒlelo Wiki](https://github.com/minad/olelo) - A a wiki that stores pages in a Git repository.
-- 
GitLab


From 3d0ae07ff602eaf3ffebf9ab01722e94901948e6 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Fri, 10 Apr 2015 10:58:32 +0200
Subject: [PATCH 086/193] remove opsview (license), closes #34

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index bb4d207..2a0c89d 100644
--- a/README.md
+++ b/README.md
@@ -343,7 +343,6 @@
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
-* [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments.
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
-- 
GitLab


From 38c511becb5b2316388e3bf2bc6cf9f6074f4933 Mon Sep 17 00:00:00 2001
From: Meir Wahnon <meir.wahnon@hp.com>
Date: Sun, 12 Apr 2015 22:17:43 +0300
Subject: [PATCH 087/193] Add CloudSlang project

Add CloudSlang project to Cloud Orchestration category
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2a0c89d..c808751 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@
 
 * [BOSH](http://docs.cloudfoundry.org/bosh/) -  IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
 * [Cloudify](http://www.getcloudify.org/) -  Open source TOSCA-based cloud orchestration software platform written in Python and YAML.
+* [CloudSlang](http://www.cloudslang.io/) -  Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
 * [Juju](https://juju.ubuntu.com/) - Cloud orechestration tool which manages services as charms, YAML configuration and deployment script bundles.
 * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
 * [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.
-- 
GitLab


From 2dbb6e926c675fc62440bfbf2d91456d65c41cc8 Mon Sep 17 00:00:00 2001
From: TETYYS <fish540@gmail.com>
Date: Sun, 12 Apr 2015 23:04:14 +0300
Subject: [PATCH 088/193] Added Citadel mail server

Added Citadel mail server in "complete solution mail servers" category
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2a0c89d..e42ff99 100644
--- a/README.md
+++ b/README.md
@@ -325,6 +325,7 @@
 
 * [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
 * [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot.
+* [Citadel](http://www.citadel.org/) - Feature packed, easy, versatile, and powerful mail server, thanks to exclusive "rooms" based architecture.
 
 
 ## Monitoring
-- 
GitLab


From f4dfe6b369014e61f735e3ce0357f8de7150ba6d Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Sun, 12 Apr 2015 22:07:14 +0100
Subject: [PATCH 089/193] Adding some XMPP web chat clients

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 2a0c89d..bdf62e1 100644
--- a/README.md
+++ b/README.md
@@ -567,6 +567,12 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
 * [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
 
+*XMPP Web Clients*
+
+* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives
+* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node
+* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript
+
 ## Web
 *Web servers.*
 
-- 
GitLab


From 4b5480345ff129c95816fccd00b0a26882b3f85a Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Sun, 12 Apr 2015 22:13:45 +0100
Subject: [PATCH 090/193] Adding packetbeat, osquery and Prometheus

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bdf62e1..097f713 100644
--- a/README.md
+++ b/README.md
@@ -343,6 +343,8 @@
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
+* [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
+* [Prometheus](http://prometheus.io/) - Service monitoring and time series database written in Go at Soundcloud.§
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
@@ -447,6 +449,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
 * [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
 * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
+* [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
@@ -569,9 +572,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 *XMPP Web Clients*
 
-* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives
-* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node
-* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript
+* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
+* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives.
+* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
 
 ## Web
 *Web servers.*
-- 
GitLab


From dc8cacdafb4c508e71c89d8a364db2a7c3801c15 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Sun, 12 Apr 2015 22:18:03 +0100
Subject: [PATCH 091/193] Cleanup

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 4fabb9d..4edf784 100644
--- a/README.md
+++ b/README.md
@@ -549,11 +549,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-<<<<<<< HEAD
 * [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
-=======
 * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution.
->>>>>>> 55b7e6c4e3269a6c8e199d77a41c778696f972b6
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From a29af5177a698faa71a82df212b222e90ef8840f Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Sun, 12 Apr 2015 22:20:00 +0100
Subject: [PATCH 092/193] Removing some dupes

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4edf784..fd95dde 100644
--- a/README.md
+++ b/README.md
@@ -345,8 +345,6 @@
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
-* [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
-* [Prometheus](http://prometheus.io/) - Service monitoring and time series database written in Go at Soundcloud.§
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
@@ -371,6 +369,7 @@
 * [InfluxDB](http://influxdb.com/) - Open source distributed time series database with no external dependencies.
 * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
+* [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
 * [Prometheus](http://prometheus.io/) - An open-source service monitoring system and time series database.
 * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
-- 
GitLab


From 3ebcffa300324ee05c14778232c52536a50fd4b6 Mon Sep 17 00:00:00 2001
From: lbriggs <lbriggs@apptio.com>
Date: Sun, 12 Apr 2015 22:21:32 +0100
Subject: [PATCH 093/193] Adding Archipel

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd95dde..6139f05 100644
--- a/README.md
+++ b/README.md
@@ -543,13 +543,14 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Virtualization
 *Virtualization software.*
 
+* [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
-* [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
+* [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
 * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution.
+* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From 96c79fb3791ac33f55fdd074b3a832a7ab273ae1 Mon Sep 17 00:00:00 2001
From: 0x70ad57001 <0x70ad57001@users.noreply.github.com>
Date: Mon, 13 Apr 2015 08:14:40 -0400
Subject: [PATCH 094/193] Add KDevelop.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2a0c89d..f4afc2c 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,7 @@
 * [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
 * [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
 * [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing.
+* [KDevelop] (https://www.kdevelop.org/) - An open source IDE by the people behind KDE.
 * [Light Table](http://www.lighttable.com/) - The next generation code editor.
 * [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
 * [TextMate](https://github.com/textmate/textmate/) - A graphical text editor for OS X.
-- 
GitLab


From 0b797ae2f8911702183a3058ae1293ebd98bde66 Mon Sep 17 00:00:00 2001
From: Xabi <xezpeleta@gmail.com>
Date: Mon, 13 Apr 2015 20:48:08 +0200
Subject: [PATCH 095/193] Add Elkarbackup

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2a0c89d..7b3600f 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@
 * [Brebis](http://brebisproject.org) - A fully automated backup checker
 * [Burp](http://burp.grke.org/) - Network backup and restore program.
 * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
+* [Elkarbackup](https://github.com/elkarbackup/) - Backup solution based on RSnapshot with a simple web interface
 * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
-- 
GitLab


From 0548ca181408756452b1f6aa1e43493c0991d695 Mon Sep 17 00:00:00 2001
From: Xabi <xezpeleta@gmail.com>
Date: Mon, 13 Apr 2015 20:52:14 +0200
Subject: [PATCH 096/193] Fix Elkarbackup link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b3600f..e522e0c 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@
 * [Brebis](http://brebisproject.org) - A fully automated backup checker
 * [Burp](http://burp.grke.org/) - Network backup and restore program.
 * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
-* [Elkarbackup](https://github.com/elkarbackup/) - Backup solution based on RSnapshot with a simple web interface
+* [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
 * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
-- 
GitLab


From c247c9be1c69dd8d401d8583919660c95b722a14 Mon Sep 17 00:00:00 2001
From: Rasesh Patel <RasPat1@gmail.com>
Date: Tue, 14 Apr 2015 01:25:40 -0400
Subject: [PATCH 097/193] Add weekly devops newsletter resource

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 99197b9..7f305c1 100644
--- a/README.md
+++ b/README.md
@@ -633,6 +633,7 @@ Various resources, such as books, websites and articles, for improving your skil
 ## Newsletters
 
 * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
+* [Operations news](http://webopsweekly.com/) - Weekly newsletter aggregating the greatest and latest from the devops and sysadmin world
 
 ## Repositories
 *Software package repositories.*
-- 
GitLab


From 0f578756a3d259cc914d486aa8e1cd0641951753 Mon Sep 17 00:00:00 2001
From: Rasesh Patel <RasPat1@gmail.com>
Date: Tue, 14 Apr 2015 12:01:45 -0400
Subject: [PATCH 098/193] Use Web Operations Weekly's title and description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f305c1..74bf6c0 100644
--- a/README.md
+++ b/README.md
@@ -633,7 +633,7 @@ Various resources, such as books, websites and articles, for improving your skil
 ## Newsletters
 
 * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
-* [Operations news](http://webopsweekly.com/) - Weekly newsletter aggregating the greatest and latest from the devops and sysadmin world
+* [Web Operations Weekly](http://webopsweekly.com/) - A weekly newsletter on Web operations, infrastructure, performance, and tooling, from the browser down to the metal.
 
 ## Repositories
 *Software package repositories.*
-- 
GitLab


From d7fdde520a70a525fd47929d695d142d7d49334e Mon Sep 17 00:00:00 2001
From: Tim Owens <genial@gmail.com>
Date: Tue, 14 Apr 2015 21:08:02 -0400
Subject: [PATCH 099/193] Add Linux Malware Detect (LMD)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 74bf6c0..f8d4606 100644
--- a/README.md
+++ b/README.md
@@ -454,6 +454,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
 * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
 * [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
+* [Linux Malware Detect](https://www.rfxn.com/projects/linux-malware-detect/) - A malware scanner for Linux designed around the threats faced in shared hosted environments.
 * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
 * [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
-- 
GitLab


From 578191531622545535f466390d73b49700cf30ac Mon Sep 17 00:00:00 2001
From: doertyDoerte! <stefan.staudenmeyer@csiweb.de>
Date: Mon, 4 May 2015 10:09:49 +0200
Subject: [PATCH 100/193] Add Service discovery -> etcd

[etcd](https://github.com/coreos/etcd) - distributed, consistent key value store for shared configuration and service discovery
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f8d4606..eeb675d 100644
--- a/README.md
+++ b/README.md
@@ -465,6 +465,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 * [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
 * [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
+* [etcd](https://github.com/coreos/etcd) - distributed K/V-Store, authenticating via SSL PKI and a REST HTTP Api for shared configuration and service discovery.
 * [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
 ## Software Containers
-- 
GitLab


From ac64dbf25cd8273075e0ca050a3562865c9836f1 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Tue, 5 May 2015 11:34:42 +0200
Subject: [PATCH 101/193] added Resources/{Communities,Wikis}

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index eeb675d..6f46156 100644
--- a/README.md
+++ b/README.md
@@ -632,6 +632,18 @@ Various resources, such as books, websites and articles, for improving your skil
 * [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
 * [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
 
+## Communities / Forums
+*For the social people.*
+
+* [ArsTechnica OpenForum](http://arstechnica.com/civis/) – IT Forum which is attached to a large news site.
+* [Reddit](https://www.reddit.com) - Really, really large bulletin board system.
+  * [/r/Linux](https://www.reddit.com/r/linux) - News and information about Linux.
+  * [/r/LinuxQuestions](https://www.reddit.com/r/linuxquestions)
+  * [/r/SysAdmin](https://www.reddit.com/r/sysadmin/)
+* [Spiceworks Community](https://community.spiceworks.com/start) – General enterprise IT news and small articles.
+* [StackExchange Network](https://stackexchange.com/sites#technology) – Q&A communities.
+  * [Server Fault](https://serverfault.com/) – StackExchange community for system and network administrators.
+
 ## Newsletters
 
 * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
@@ -657,6 +669,12 @@ Various resources, such as books, websites and articles, for improving your skil
 * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
 * [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
 
+## Wikis
+*Useful Wikis for Sysadmins – not to be confused with Wiki software.*
+
+* [ArchWiki](https://wiki.archlinux.org/) – Arch Linux Wiki which has really nice written articles valid for other distros.
+* [Gentoo Wiki](https://wiki.gentoo.org/) - Gentoo Linux Wiki with a lot in-detail description of Linux components.
+
 ## License
 
 ![cc license](http://i.creativecommons.org/l/by-sa/4.0/88x31.png)
-- 
GitLab


From 380bb287853aeab373923ca53a0820f49421c45f Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Tue, 5 May 2015 11:37:26 +0200
Subject: [PATCH 102/193] linked new categories, hope that'll work

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6f46156..71aeff0 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,15 @@
   * [VPN](#vpn)
   * [XMPP](#xmpp)
   * [Web](#web)
-  * [Wikis](#wikis)
+  * [Wiki Software](#wiki-software)
 * [Resources](#resources)
   * [Blogs](#blogs)
   * [Books](#books)
+  * [Communities/Forums](#communities-forums)
   * [Newsletters](#newsletters)
   * [Repositories](#repositories)
   * [Websites](#websites)
+  * [Wikis](#wikis)
 
 ## Automation
 *Automation build.*
@@ -602,8 +604,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Varnish](https://www.varnish-cache.org/) - HTTP based web application accelerator focusing on optimizing caching and compression.
 
 
-## Wikis
-*Wiki software.*
+## Wiki Software
 
 * [DokuWiki](https://www.dokuwiki.org/dokuwiki) - Simple to use and highly versatile wiki that doesn't require a database.
 * [Gollum](https://github.com/gollum/gollum) - A simple, Git-powered wiki with a sweet API and local frontend.
-- 
GitLab


From 45e119b2af76d1fc9fe992335f0190bfbd9b0433 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Tue, 5 May 2015 11:38:23 +0200
Subject: [PATCH 103/193] fixed link to communities category

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71aeff0..a36ed3f 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@
 * [Resources](#resources)
   * [Blogs](#blogs)
   * [Books](#books)
-  * [Communities/Forums](#communities-forums)
+  * [Communities/Forums](#communities--forums)
   * [Newsletters](#newsletters)
   * [Repositories](#repositories)
   * [Websites](#websites)
-- 
GitLab


From 977cf045255abd8c074000987f04ef024ad3a5ec Mon Sep 17 00:00:00 2001
From: doertyDoerte! <stefan.staudenmeyer@csiweb.de>
Date: Wed, 6 May 2015 13:19:32 +0200
Subject: [PATCH 104/193] Add Security -> Bro

Bro is a powerful framework for network analysis and security monitoring.

-> [Github Repo](https://github.com/bro/bro)
-> [Website](http://www.bro.org)
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a36ed3f..e2bb275 100644
--- a/README.md
+++ b/README.md
@@ -451,6 +451,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Security tools.*
 
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
+* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring. 
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
-- 
GitLab


From 73adc5955424fa0a6bee3fdc70ef48bfaa41bd4a Mon Sep 17 00:00:00 2001
From: Charlie Richards <charlie.richards@cu.edu>
Date: Wed, 13 May 2015 20:55:22 -0600
Subject: [PATCH 105/193] add FreeIPA to LDAP section

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e2bb275..45cc6ed 100644
--- a/README.md
+++ b/README.md
@@ -273,6 +273,7 @@
 * [389 Directory Server](http://port389.org) - Developed by Red Hat.
 * [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
 * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
+* [FreeIPA](http://http://www.freeipa.org/) - FreeIPA is an integrated security information management solution, can manage LDAP,KRB,DNS, and more
 * [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
 * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
 * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
-- 
GitLab


From a9e58411d37396654e32ee071511f7d79184b635 Mon Sep 17 00:00:00 2001
From: Charlie Richards <charlie.richards@cu.edu>
Date: Wed, 13 May 2015 20:57:06 -0600
Subject: [PATCH 106/193] shorten FreeIPA description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 45cc6ed..438e1be 100644
--- a/README.md
+++ b/README.md
@@ -273,7 +273,7 @@
 * [389 Directory Server](http://port389.org) - Developed by Red Hat.
 * [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
 * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
-* [FreeIPA](http://http://www.freeipa.org/) - FreeIPA is an integrated security information management solution, can manage LDAP,KRB,DNS, and more
+* [FreeIPA](http://http://www.freeipa.org/) - FreeIPA security information management solution, can manage LDAP,KRB,DNS, and more
 * [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
 * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
 * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
-- 
GitLab


From df9988af69e3cd3c24340052517c082ffd91ccd5 Mon Sep 17 00:00:00 2001
From: Charlie Richards <charlie.richards@cu.edu>
Date: Wed, 13 May 2015 20:58:26 -0600
Subject: [PATCH 107/193] shorten FreeIPA description and fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 438e1be..0332e21 100644
--- a/README.md
+++ b/README.md
@@ -273,7 +273,7 @@
 * [389 Directory Server](http://port389.org) - Developed by Red Hat.
 * [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
 * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
-* [FreeIPA](http://http://www.freeipa.org/) - FreeIPA security information management solution, can manage LDAP,KRB,DNS, and more
+* [FreeIPA](http://www.freeipa.org/) - security management solution, can manage LDAP,KRB,DNS, sudo, and more
 * [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
 * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
 * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
-- 
GitLab


From 02fe4d96306369e2e08876bf2d43771c04e6cb38 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Thu, 14 May 2015 08:57:45 +0200
Subject: [PATCH 108/193] renamed LDAP to identity managed, restructured, added
 LAM+Samba

---
 README.md | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 0332e21..aea3883 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@
   * [Distributed Filesystems](#distributed-filesystems)
   * [DNS](#dns)
   * [Editors](#editors)
+  * [Identity Management](#identity-management)
   * [IT Asset Management](#it-asset-management)
-  * [LDAP](#ldap)
   * [Log Management](#log-management)
   * [Mail Clients](#mail-clients)
   * [Mail Servers](#mail-servers)
@@ -258,6 +258,22 @@
 * [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.
 
+## Identity Management
+*LDAP servers and other tools to manage accounts and identities.*
+
+### LDAP
+* [389 Directory Server](http://port389.org) - Developed by Red Hat.
+* [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
+* [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
+* [OpenDS](https://opends.java.net/) - Another directory server written in Java.
+* [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
+
+### Tools and web interfaces
+* [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
+* [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
+* [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
+* [Samba](https://www.samba.org/) – Open Source Active Directory and CIFS protocol implementation.
+
 ## IT Asset Management
 *IT Assets Management software.*
 
@@ -267,17 +283,6 @@
 * [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
 * [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
 
-## LDAP
-*LDAP servers.*
-
-* [389 Directory Server](http://port389.org) - Developed by Red Hat.
-* [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
-* [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
-* [FreeIPA](http://www.freeipa.org/) - security management solution, can manage LDAP,KRB,DNS, sudo, and more
-* [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
-* [OpenDS](https://opends.java.net/) - Another directory server written in Java.
-* [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
-
 ## Log Management
 *Log management tools: collect, parse, visualize ...*
 
-- 
GitLab


From c7b8563fba6ada69efccb6bd41907ae2fa8e9945 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Thu, 14 May 2015 09:00:17 +0200
Subject: [PATCH 109/193] added comment header for inclusion in Phile CMS,
 closes #46

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index aea3883..e68eacf 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+/*
+  Title: Awesome Sysadmin
+  Description: A curated list of amazingly awesome open source sysadmin resources.
+  Author: n1trux
+  */
+
 # Awesome Sysadmin
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/n1trux/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
-- 
GitLab


From e78a02b3656567e4d273747529f57ac6b4b83693 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Thu, 14 May 2015 09:03:37 +0200
Subject: [PATCH 110/193] fixed the damn Phile comment header

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e68eacf..a10aa8f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-/*
+<!--
   Title: Awesome Sysadmin
   Description: A curated list of amazingly awesome open source sysadmin resources.
   Author: n1trux
-  */
+  -->
 
 # Awesome Sysadmin
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/n1trux/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
-- 
GitLab


From 51fa18179d4d1a3c698baed8fcbfda536165eb51 Mon Sep 17 00:00:00 2001
From: Michael Barrett <loki77@gmail.com>
Date: Fri, 22 May 2015 22:20:52 -0700
Subject: [PATCH 111/193] Add ssh-cert-authority

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 31d392e..77457ba 100644
--- a/README.md
+++ b/README.md
@@ -500,6 +500,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
 * [Mosh](http://mosh.mit.edu/) - The mobile shell.
 * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
+* [ssh-cert-authority](https://github.com/cloudtools/ssh-cert-authority) - A democratic SSH certificate authority.
 * [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
 * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
 * [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
-- 
GitLab


From b04e4504c33b246768395bfa57b0d4f62af06aab Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Wed, 27 May 2015 10:34:58 -0300
Subject: [PATCH 112/193] Include Cracow Cloud One

CC1 is hosted on Github, https://github.com/cc1-cloud/cc1/
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 31d392e..95dbc35 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@
 * [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
 * [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
 * [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
+* [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
 * [Eucalyptus](https://www.eucalyptus.com/) - Open source private cloud software with AWS compatibility.
 * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
 * [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
-- 
GitLab


From dab986c5a4ad4b8d361eef0f6dfe5b6f4f493708 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Thu, 28 May 2015 10:44:54 -0300
Subject: [PATCH 113/193] Add a lot of applications

Add Horde - Webmail and groupware client
Add Rainloop - Very nice webmail with IMAP/SMTP Support and multi accounting
Add Modoboa - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface.
Add Fufix - Fufix is a mailserver installer based on Dovecot, Postfix, Postfixadmin, Nginx, PHP, MySQL and Fail2ban.
Add Stashboard - The open source status page for cloud services and APIs.
Add System Status Dashboard - SSD is a status dashboard designed to provide an easy to understand view into an organization's infrastructure health status.
Add Staytus - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
Add LibreMailer - LibreMailer is a modest and simple web based email marketing application.
Add Lewsnetter - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index bb27283..df63e43 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,8 @@
 * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
 * [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
+* [Horde](http://www.horde.org) - Webmail and groupware client
+* [Rainloop](http://www.rainloop.net) - Very nice webmail with IMAP/SMTP Support and multi accounting
 
 ## Mail Servers
 *Software for setting up mail servers.*
@@ -344,6 +346,8 @@
 * [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
 * [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot.
 * [Citadel](http://www.citadel.org/) - Feature packed, easy, versatile, and powerful mail server, thanks to exclusive "rooms" based architecture.
+* [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface.
+* [Fufix](https://www.debinux.de/fufix/) - Fufix is a mailserver installer based on Dovecot, Postfix, Postfixadmin, Nginx, PHP, MySQL and Fail2ban.
 
 
 ## Monitoring
@@ -407,6 +411,8 @@
 
 * [DadaMail](http://dadamailproject.com/) - Mailing List Manager, written in Perl.
 * [phpList](http://www.phplist.com/) - Newsletter manager written in PHP.
+* [LibreMailer](https://github.com/averna-syd/LibreMailer) - Libre Mailer is a modest and simple web based email marketing application.
+* [Lewsnetter](https://github.com/bborn/lewsnetter) - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
 
 ## NoSQL
 *NoSQL databases.*
@@ -520,6 +526,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Status Pages
 
 * [Cachet](https://cachethq.io) - An open source status page system written in PHP.
+* [Stashboard](http://www.stashboard.org) - The open source status page for cloud services and APIs.
+* [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - SSD is a status dashboard designed to provide an easy to understand view into an organization's infrastructure health status.
+* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services. 
 
 ## Ticketing systems
 *Web-based ticketing system.*
-- 
GitLab


From c1f7e4ee62c4484af3f070acc0cf3eb63ea05273 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Thu, 28 May 2015 11:21:28 -0300
Subject: [PATCH 114/193] Update README.md

Add Pydio, ownCloud alternative
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index df63e43..37124fd 100644
--- a/README.md
+++ b/README.md
@@ -136,6 +136,7 @@
 
 * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
 * [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
+* [Pydio])(https://pyd.io) - Pydio (formerly AjaXplorer) is a mature open source software solution for file sharing and synchronization.
 * [Seafile](http://seafile.com) - Another Open Source Cloud Storage solution.
 * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
 * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-- 
GitLab


From 4e1b7dd55e2b5fa2deed5c8dfe76723066ea84b7 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Thu, 28 May 2015 16:26:21 +0200
Subject: [PATCH 115/193] fixed link to pydio

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 37124fd..07ab8a7 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@
 
 * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
 * [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
-* [Pydio])(https://pyd.io) - Pydio (formerly AjaXplorer) is a mature open source software solution for file sharing and synchronization.
+* [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature open source software solution for file sharing and synchronization.
 * [Seafile](http://seafile.com) - Another Open Source Cloud Storage solution.
 * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
 * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-- 
GitLab


From 8e1b2f63abd02d6c1941def8d7cc7071f603791e Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Thu, 28 May 2015 11:31:07 -0300
Subject: [PATCH 116/193] Update README.md

Add Tsuru, Tsuru is an extensible and open source Platform as a Service software
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 07ab8a7..e90789c 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@
 * [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
 * [OpenStack](https://www.openstack.org/) - Open source software for building private and public clouds.
 * [The Foreman](http://theforeman.org/) - Foreman is a complete lifecycle management tool for physical and virtual servers. FOSS.
+* [Tsuru](https://tsuru.io) - Tsuru is an extensible and open source Platform as a Service software.
 
 ## Cloud Orchestration
 
-- 
GitLab


From a61d80fad3ef075616c3eec1061f45950a9a88ed Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Fri, 29 May 2015 14:03:52 -0300
Subject: [PATCH 117/193] Add Openshift

Now I will add one app per day, today is Openshift, open source enterprise PaaS powered by Red Hat
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e90789c..d20fff9 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@
 * [Eucalyptus](https://www.eucalyptus.com/) - Open source private cloud software with AWS compatibility.
 * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
 * [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
+* [Openshift](http://www.openshift.org) - OpenShift is a platform as a service product from Red Hat.
 * [OpenStack](https://www.openstack.org/) - Open source software for building private and public clouds.
 * [The Foreman](http://theforeman.org/) - Foreman is a complete lifecycle management tool for physical and virtual servers. FOSS.
 * [Tsuru](https://tsuru.io) - Tsuru is an extensible and open source Platform as a Service software.
-- 
GitLab


From ab6d61ed3eae1ccdff9a7df3bfd313a77b15281a Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Mon, 1 Jun 2015 09:01:33 -0300
Subject: [PATCH 118/193] Add Flynn

Flynn deploys apps, scales apps, and manages databases with best practices right out of the box.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d20fff9..31f0d67 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,7 @@
 * [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
 * [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
 * [Eucalyptus](https://www.eucalyptus.com/) - Open source private cloud software with AWS compatibility.
+* [Flynn](https://flynn.io) - Open source PaaS
 * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
 * [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
 * [Openshift](http://www.openshift.org) - OpenShift is a platform as a service product from Red Hat.
-- 
GitLab


From e5aaf0ff7ff2d1db4d5fa3abeebb8d5271541736 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Tue, 2 Jun 2015 11:35:29 -0300
Subject: [PATCH 119/193] Add PhpSysInfo

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 31f0d67..f564374 100644
--- a/README.md
+++ b/README.md
@@ -372,6 +372,7 @@
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
 * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
+* [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
-- 
GitLab


From 9a8d844c06477fb8af8ace7c94469dc85fe2dbba Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Wed, 3 Jun 2015 08:37:13 -0300
Subject: [PATCH 120/193] Add ServerStatus and Fix LibreNMS data

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f564374..1c1e96d 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@
 * [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 * [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
-* [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
+* [LibreNMS](https://github.com/librenms/librenms/) - Fully featured network monitoring system that provides a wealth of features and device support.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
 * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
 * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
@@ -376,6 +376,7 @@
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
+* [ServerStatus](https://github.com/BotoX/ServerStatus) - Display and monitor your servers statistics in a beatiful way.
 * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
 * [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
 * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
-- 
GitLab


From df0a32f9bcbaf7057dbc6b65e828ab73dd3130c4 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Wed, 3 Jun 2015 11:59:26 -0300
Subject: [PATCH 121/193] Fix LibreNMS url

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1c1e96d..49d4c44 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@
 * [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
 * [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
-* [LibreNMS](https://github.com/librenms/librenms/) - Fully featured network monitoring system that provides a wealth of features and device support.
+* [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
 * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
 * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
 * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
-- 
GitLab


From 31c55d059a2f4297990df6e1636f50feec4cee3f Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Thu, 4 Jun 2015 10:40:19 -0300
Subject: [PATCH 122/193] Add WebVirtMgr

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 49d4c44..2d3cf89 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,7 @@
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
 * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
 * [Webmin](http://www.webmin.com/) - Linux server control panel.
+* [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
 * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
 
 ## Deployment Automation
-- 
GitLab


From eb44e0f2643c207c8ee8253e9eb5aec332f4d086 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Fri, 5 Jun 2015 11:08:27 -0300
Subject: [PATCH 123/193] Add Another ServerStatus

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d3cf89..34dc2ec 100644
--- a/README.md
+++ b/README.md
@@ -377,7 +377,8 @@
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
 * [Sensu](http://sensuapp.org/) - Open source monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
-* [ServerStatus](https://github.com/BotoX/ServerStatus) - Display and monitor your servers statistics in a beatiful way.
+* [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
 * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
 * [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
 * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
-- 
GitLab


From 14bf0d74c4733e6734971eb2675699d2fa2c99ed Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Sun, 7 Jun 2015 11:20:15 -0300
Subject: [PATCH 124/193] Add Virtkick

Virtkick is vm orchestrator with panel similar to Digital Ocean, backend and frontend is open source on https://github.com/virtkick/
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 34dc2ec..0c535d9 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,7 @@
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
 * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
+* [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
 * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
 * [Webmin](http://www.webmin.com/) - Linux server control panel.
 * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
-- 
GitLab


From 48fbb27bc496bcf3f71d0d9eba4b0096987c6bcf Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Mon, 8 Jun 2015 09:12:10 -0300
Subject: [PATCH 125/193] Add ConVirt

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0c535d9..8bd2e15 100644
--- a/README.md
+++ b/README.md
@@ -586,6 +586,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Virtualization software.*
 
 * [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
+* [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your open source KVM or Xen virtualized environment.
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
-- 
GitLab


From 8fd5f6e440216e9130a657b7aa65a48bd565d7ff Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Tue, 9 Jun 2015 09:19:57 -0300
Subject: [PATCH 126/193] Add Panamax

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8bd2e15..05c6251 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@
 * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
 * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+* [Panamax](http://panamax.io/) - An open-source project that makes deploying complex containerized apps as easy as Drag-and-Drop.
 * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
 * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-- 
GitLab


From 81ce734e92e7e33d25ddf8bddf17b6aec6b21257 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Wed, 10 Jun 2015 07:55:42 -0300
Subject: [PATCH 127/193] Add BandwidthD

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 05c6251..fb94828 100644
--- a/README.md
+++ b/README.md
@@ -360,7 +360,8 @@
 ## Monitoring
 *Monitoring software.*
 
-* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system. 
+* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
+* [BandwidthD](http://bandwidthd.sourceforge.net/) - BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization.
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
-- 
GitLab


From 7ed3f99ea49586df36af0e0483c3811f7e6ba058 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Thu, 11 Jun 2015 09:17:34 -0300
Subject: [PATCH 128/193] Add Atomia DNS

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fb94828..250e5d9 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,7 @@
 *Web hosting and server control panels*
 
 * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
+* [Atomia DNS](http://atomiadns.com/) - Free and open source DNS management system.
 * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
 * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
 * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-- 
GitLab


From c7fb8d6fd480487c99198f7738394db7fffc7db0 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Fri, 12 Jun 2015 09:12:11 -0300
Subject: [PATCH 129/193] Add PDNS Gui

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 250e5d9..b4c3ebd 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,7 @@
 * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
 * [Panamax](http://panamax.io/) - An open-source project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+* [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend. 
 * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
 * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-- 
GitLab


From aede00866cc1e0a5a87a7e8507dd44e3a116fe6b Mon Sep 17 00:00:00 2001
From: Phelan Vendeville <phelan.vendeville@gmail.com>
Date: Sat, 13 Jun 2015 10:34:49 -0700
Subject: [PATCH 130/193] Add bazel build automation tool.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b4c3ebd..47e6883 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@
 
 * [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
 * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
+* [Bazel](http://bazel.io/) - Google's open source build system.
 * [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
 * [Gradle](http://gradle.org/) - Another open source build automation system.
 
-- 
GitLab


From 50f36a13d36d87a0afdfa6a9dd3a92ff6fb1d6b5 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <joubert@redrat.com.br>
Date: Mon, 15 Jun 2015 08:18:45 -0300
Subject: [PATCH 131/193] Add Poweradmin

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 47e6883..aeb58ca 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,7 @@
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
 * [Panamax](http://panamax.io/) - An open-source project that makes deploying complex containerized apps as easy as Drag-and-Drop.
 * [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend. 
+* [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
 * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
 * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
 * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-- 
GitLab


From 6927259e048cad6150ae49b19b43f60e9e70edfa Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 15 Jun 2015 19:25:32 +0200
Subject: [PATCH 132/193] remove redundant 'open source' text, closes #53

---
 README.md | 90 +++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index b495a98..7355919 100644
--- a/README.md
+++ b/README.md
@@ -65,9 +65,9 @@
 
 * [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
 * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
-* [Bazel](http://bazel.io/) - Google's open source build system.
+* [Bazel](http://bazel.io/) - Google's build system.
 * [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
-* [Gradle](http://gradle.org/) - Another open source build automation system.
+* [Gradle](http://gradle.org/) - Another build automation system.
 
 ## Backups
 *Backup software.*
@@ -94,8 +94,8 @@
 ## ChatOps
 *Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
 
-* [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable, open-source Python IRC bot.
-* [Eggdrop](http://www.eggheads.org/) - the world's most popular Open Source IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
+* [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable Python IRC bot.
+* [Eggdrop](http://www.eggheads.org/) - the world's most popular IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
 * [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
 * [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
 * [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
@@ -110,24 +110,24 @@
 
 ## Cloud Computing
 
-* [AppScale](http:/github.com/AppScale/appscale) - Open source cloud software with Google App Engine compatibility.
+* [AppScale](http:/github.com/AppScale/appscale) - Cloud software with Google App Engine compatibility.
 * [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
 * [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
 * [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
 * [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
-* [Eucalyptus](https://www.eucalyptus.com/) - Open source private cloud software with AWS compatibility.
-* [Flynn](https://flynn.io) - Open source PaaS
+* [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
+* [Flynn](https://flynn.io) - PaaS
 * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
 * [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
 * [Openshift](http://www.openshift.org) - OpenShift is a platform as a service product from Red Hat.
-* [OpenStack](https://www.openstack.org/) - Open source software for building private and public clouds.
+* [OpenStack](https://www.openstack.org/) - Software for building private and public clouds.
 * [The Foreman](http://theforeman.org/) - Foreman is a complete lifecycle management tool for physical and virtual servers. FOSS.
-* [Tsuru](https://tsuru.io) - Tsuru is an extensible and open source Platform as a Service software.
+* [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
 
 ## Cloud Orchestration
 
 * [BOSH](http://docs.cloudfoundry.org/bosh/) -  IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
-* [Cloudify](http://www.getcloudify.org/) -  Open source TOSCA-based cloud orchestration software platform written in Python and YAML.
+* [Cloudify](http://www.getcloudify.org/) -  TOSCA-based cloud orchestration software platform written in Python and YAML.
 * [CloudSlang](http://www.cloudslang.io/) -  Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
 * [Juju](https://juju.ubuntu.com/) - Cloud orechestration tool which manages services as charms, YAML configuration and deployment script bundles.
 * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
@@ -140,11 +140,11 @@
 
 * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
 * [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
-* [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature open source software solution for file sharing and synchronization.
-* [Seafile](http://seafile.com) - Another Open Source Cloud Storage solution.
+* [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature solution for file sharing and synchronization.
+* [Seafile](http://seafile.com) - Another Cloud Storage solution.
 * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
 * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-* [Syncthing](http://syncthing.net/) - Open Source system for private, encrypted and authenticated distribution of data.
+* [Syncthing](http://syncthing.net/) - System for private, encrypted and authenticated distribution of data.
 
 ## Code Review
 *Web Based collaborative code review system.*
@@ -166,8 +166,8 @@
 ## Configuration Management Database
 *Configuration management database (CMDB) software.*
 
-* [i-doit](http://www.i-doit.org/) - Open Source IT Documentation and CMDB.
-* [iTop](http://www.combodo.com/-Overview-.html) - Complete open source, ITIL, web based service management tool.
+* [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
+* [iTop](http://www.combodo.com/-Overview-.html) - 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.
 * [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopaedia toolkit (based on mediawiki).
 * [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.
@@ -199,19 +199,19 @@
 * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
 * [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
 * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
-* [Go](http://www.go.cd/) - Open source continuous delivery server.
-* [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server.
+* [Go](http://www.go.cd/) - Continuous delivery server.
+* [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
 
 ## Control Panels
 *Web hosting and server control panels*
 
 * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
-* [Atomia DNS](http://atomiadns.com/) - Free and open source DNS management system.
+* [Atomia DNS](http://atomiadns.com/) - DNS management system.
 * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
 * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
 * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
 * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
-* [Panamax](http://panamax.io/) - An open-source project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+* [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
 * [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend. 
 * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
 * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
@@ -239,7 +239,7 @@
 * [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
 * [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
 * [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
-* [Lustre](http://lustre.opensfs.org/) -  A type of parallel distributed file system, generally used for large-scale cluster computing.
+* [Lustre](http://lustre.opensfs.org/) - Parallel distributed file system, generally used for large-scale cluster computing.
 * [MooseFS](http://www.moosefs.org/) - Fault tolerant, network distributed file system.
 * [MogileFS](http://mogilefs.org/) - Application level, network distributed file system.
 * [OpenAFS](http://www.openafs.org/) - Distributed network file system with read-only replicas and multi-OS support.
@@ -263,14 +263,14 @@
 *Open source code editors.*
 
 * [Atom](https://atom.io/) - A hackable text editor from Github.
-* [Brackets](http://brackets.io/) - Open source code editor for web designers and front-end developers.
+* [Brackets](http://brackets.io/) - Code editor for web designers and front-end developers.
 * [Eclipse](http://eclipse.org/) - IDE written in Java with an extensible plug-in system.
 * [Geany](http://www.geany.org/) - GTK2 text editor.
 * [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
 * [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
 * [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
 * [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing.
-* [KDevelop] (https://www.kdevelop.org/) - An open source IDE by the people behind KDE.
+* [KDevelop](https://www.kdevelop.org/) - IDE by the people behind KDE.
 * [Light Table](http://www.lighttable.com/) - The next generation code editor.
 * [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
 * [TextMate](https://github.com/textmate/textmate/) - A graphical text editor for OS X.
@@ -290,7 +290,7 @@
 * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
 * [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
 * [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
-* [Samba](https://www.samba.org/) – Open Source Active Directory and CIFS protocol implementation.
+* [Samba](https://www.samba.org/) – Active Directory and CIFS protocol implementation.
 
 ## IT Asset Management
 *IT Assets Management software.*
@@ -345,7 +345,7 @@
 * [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge.
 * [Haraka](http://haraka.github.io/) - A high-performance, pluginable SMTP server written in JavaScript.
 * [MailCatcher](http://mailcatcher.me/) - Ruby gem that deploys a simply SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development.
-* [Maildrop](https://github.com/m242/maildrop) - Open Source disposable email SMTP server, also useful for development.
+* [Maildrop](https://github.com/m242/maildrop) - Disposable email SMTP server, also useful for development.
 * [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project.
 * [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement.
 * [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
@@ -373,7 +373,7 @@
 * [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
 * [Icinga](https://www.icinga.org/) - Fork of Nagios.
 * [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
-* [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
+* [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
 * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
 * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
 * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
@@ -382,7 +382,7 @@
 * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
 * [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
 * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
-* [Sensu](http://sensuapp.org/) - Open source monitoring framework.
+* [Sensu](http://sensuapp.org/) - Monitoring framework.
 * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
 * [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
@@ -403,13 +403,13 @@
 * [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI.
 * [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
 * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
-* [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scalable graphing server.
-* [InfluxDB](http://influxdb.com/) - Open source distributed time series database with no external dependencies.
+* [Graphite](http://graphite.readthedocs.org/en/latest/) - Scalable graphing server.
+* [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
 * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
 * [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
-* [Prometheus](http://prometheus.io/) - An open-source service monitoring system and time series database.
-* [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
+* [Prometheus](http://prometheus.io/) - Service monitoring system and time series database.
+* [RRDtool](http://oss.oetiker.ch/rrdtool/) - Industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
 
 ## Network Configuration Management
@@ -441,10 +441,10 @@
   * [ElasticSearch](http://www.elasticsearch.org/) - Java based database, popular with log aggregation, and email archiving projects.
   * [MongoDB](http://www.mongodb.org/) - Another document-oriented database system.
   * [RavenDB](http://ravendb.net/) - Document based database with ACID/Transactional features.
-  * [RethinkDB](http://www.rethinkdb.com/) - Open source distributed document store database, focuses on JSON.
+  * [RethinkDB](http://www.rethinkdb.com/) - Distributed document store database, focuses on JSON.
 * Graph
   * [FlockDB](https://github.com/twitter/flockdb) - Twitter's distributed, fault-tolerant graph database.
-  * [Neo4j](http://www.neo4j.org/) - Open source graph database.
+  * [Neo4j](http://www.neo4j.org/) - Graph database.
 * Key-Value
   * [LevelDB](https://github.com/google/leveldb) - Google's high performance key/value database.
   * [Redis](http://redis.io/) - Networked, in-memory, key-value data store with optional durability.
@@ -461,7 +461,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Queuing
 
-* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker.
+* [ActiveMQ](https://activemq.apache.org/) - Java message broker.
 * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
 * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
 * [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
@@ -472,13 +472,13 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## RDBMS
 *Relational DBMS.*
 
-* [Firebird](http://www.firebirdsql.org/) - True universal open source database.
+* [Firebird](http://www.firebirdsql.org/) - True universal database.
 * [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
 * [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
 * [MySQL](http://dev.mysql.com/) - Most popular RDBMS server.
 * [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
 * [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
-* [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable Open Source PostgreSQL-based database cluster.
+* [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
 * [SQLite](http://sqlite.org/) - Library that implements a self-contained, serverless, zero-configuration, transactional SQL DBS.
 
 ## Security
@@ -495,7 +495,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
 * [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
-* [Snort](https://www.snort.org/) - Snort is a free and open source network intrusion prevention system (NIPS) and network intrusion detection system (NIDS) created by Martin Roesch in 1998.
+* [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
 
 ## Service Discovery
@@ -508,7 +508,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Software Containers
 *Operating system–level virtualization.*
 
-* [Docker](http://www.docker.com/) - Open platform for developers and sysadmins to build, ship, and run distributed applications.
+* [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
 * [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
@@ -539,9 +539,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Status Pages
 
-* [Cachet](https://cachethq.io) - An open source status page system written in PHP.
-* [Stashboard](http://www.stashboard.org) - The open source status page for cloud services and APIs.
-* [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - SSD is a status dashboard designed to provide an easy to understand view into an organization's infrastructure health status.
+* [Cachet](https://cachethq.io) - Status page system written in PHP.
+* [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
+* [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
 * [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services. 
 
 ## Ticketing systems
@@ -571,10 +571,10 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
 * [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby.
 * [Gogs](http://gogs.io/) - Self-hosted Git service written in Go.
-* [OpenProject](https://www.openproject.org) - Project collaboration with open source.
+* [OpenProject](https://www.openproject.org) - Project collaboration.
 * [Phabricator](http://phabricator.org/) Written in PHP.
 * [Redmine](http://www.redmine.org/) - Written in ruby on rails.
-* [Taiga](https://taiga.io/) - Agile, Free, Open Source Project Management Tool based on the Kanban and Scrum methods.
+* [Taiga](https://taiga.io/) - Agile Project Management Tool based on the Kanban and Scrum methods.
 * [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
 * [Trac](http://trac.edgewall.org/) - Written in python.
 
@@ -591,14 +591,14 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Virtualization software.*
 
 * [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
-* [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your open source KVM or Xen virtualized environment.
+* [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your KVM or Xen virtualized environment.
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution.
-* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
+* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
+* [QEMU](http://www.qemu.org/) - QEMU is a generic machine emulator and virtualizer.
 * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
 * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
 * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
-- 
GitLab


From 958ae99908a598d17d29bfed9108ce4f6beaade9 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 15 Jun 2015 19:27:44 +0200
Subject: [PATCH 133/193] move consolidation suggestion to PR section, closes
 #65

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index def4ecb..d6ceab5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,9 +9,9 @@ This is a compilation of **Free and Libre Open Source Software ([FLOSS](https://
   * End descriptions with a full stop.
 * Make an individual commit for each category.
   * Order projects alphabetically.
-  * Consolidate multiple commits.
   
 ## 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.
 
-- 
GitLab


From d4a426c798044741e025ddf23b2b8b2840ddcf07 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Tue, 16 Jun 2015 10:19:30 -0300
Subject: [PATCH 134/193] Split control panels intro subgroups

---
 README.md | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 7355919..fb90b48 100644
--- a/README.md
+++ b/README.md
@@ -205,22 +205,29 @@
 ## Control Panels
 *Web hosting and server control panels*
 
-* [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
-* [Atomia DNS](http://atomiadns.com/) - DNS management system.
-* [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
-* [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
-* [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-* [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
-* [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
-* [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend. 
-* [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
-* [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
-* [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-* [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-* [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
-* [Webmin](http://www.webmin.com/) - Linux server control panel.
-* [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
-* [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
+* Web hosting
+  * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
+  * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+  * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
+  * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
+  * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
+* E-mail
+* DNS
+  * [Atomia DNS](http://atomiadns.com/) - DNS management system.
+  * [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend.
+  * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
+* Revision Control
+* Virtualization
+  * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
+  * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+  * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
+  * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
+* Server
+  * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
+  * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
+  * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
+  * [Webmin](http://www.webmin.com/) - Linux server control panel.
+* Others
 
 ## Deployment Automation
 *Tools and scripts to support deployments to your servers.*
-- 
GitLab


From d725864eed57790343a549357745fbd582d51a7f Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Tue, 16 Jun 2015 10:21:18 -0300
Subject: [PATCH 135/193] Fix Poweradmin information

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb90b48..3af5e4a 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@
 * E-mail
 * DNS
   * [Atomia DNS](http://atomiadns.com/) - DNS management system.
-  * [PDNS Gui](https://github.com/odoucet/pdns-gui) - Web based GUI which aids in administering domains and records for the PowerDNS with MySQL backend.
+  * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
   * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
 * Revision Control
 * Virtualization
-- 
GitLab


From 593731226d2d6e9fed565c231320bdafa32de811 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Tue, 16 Jun 2015 10:23:01 -0300
Subject: [PATCH 136/193] Fix description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3af5e4a..3d0971e 100644
--- a/README.md
+++ b/README.md
@@ -203,7 +203,7 @@
 * [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
 
 ## Control Panels
-*Web hosting and server control panels*
+*Web hosting and server or service control panels*
 
 * Web hosting
   * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-- 
GitLab


From 7b1d3958c272f97acd14b8b8c25ff8f7b39197d5 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 17 Jun 2015 18:57:25 +0200
Subject: [PATCH 137/193] adding cat. 'client management' with Opsi, WAPT, OCS
 Inventory NG

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 3d0971e..c62187e 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@
   * [Automation](#automation)
   * [Backups](#backups)
   * [ChatOps](#chatops)
+  * [Client Management](#client-management)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
   * [Cloud Storage](#cloud-storage)
@@ -101,6 +102,13 @@
 * [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
 * [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
 
+## Client management
+*Managing software on desktop computers.*
+
+* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) – automated inventory, deployment and network scan.
+* [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management System for Windows clients based on Debian.
+* [WAPT] (apt-get for Windows) – automated, network-wide (un)installation, configuration and upgrades of Windows based software.
+
 ## Cloning
 *Cloning software.*
 
-- 
GitLab


From 95cd908cf174ccc15ed17feb4c5d9f004827f473 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 17 Jun 2015 19:06:41 +0200
Subject: [PATCH 138/193] added WPKG to 'client management'

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c62187e..407929e 100644
--- a/README.md
+++ b/README.md
@@ -105,9 +105,10 @@
 ## Client management
 *Managing software on desktop computers.*
 
-* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) – automated inventory, deployment and network scan.
-* [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management System for Windows clients based on Debian.
-* [WAPT] (apt-get for Windows) – automated, network-wide (un)installation, configuration and upgrades of Windows based software.
+* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
+* [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
+* [WAPT] - Network-wide (un)installation, configuration and upgrades of Windows based software.
+* [WPKG] - Software deployment, upgrade and removal program for Windows.
 
 ## Cloning
 *Cloning software.*
-- 
GitLab


From d6c20776dadb2b1f742c17d2132506ad7e87a5fc Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Wed, 17 Jun 2015 14:37:06 -0300
Subject: [PATCH 139/193] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 407929e..1eb85c8 100644
--- a/README.md
+++ b/README.md
@@ -221,6 +221,7 @@
   * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
   * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
 * E-mail
+  * [Postfix Admin](http://postfixadmin.sourceforge.net/) - web interface to manage postfix mailboxes, virtual domains and aliases.
 * DNS
   * [Atomia DNS](http://atomiadns.com/) - DNS management system.
   * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
-- 
GitLab


From 11fb471648854e1cb1f0ad9494e7f64d07dbfa7f Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Thu, 18 Jun 2015 09:03:31 -0300
Subject: [PATCH 140/193] Add SCM-Manager

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1eb85c8..9bde1ea 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,7 @@
   * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
   * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
 * Revision Control
+  * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
 * Virtualization
   * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
   * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
-- 
GitLab


From 8aa5bdc0f25b528448c30600be636d0b271affb5 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Fri, 19 Jun 2015 08:30:19 -0300
Subject: [PATCH 141/193] Add iF.SVNAdmin

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9bde1ea..da53147 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,7 @@
   * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
   * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
 * Revision Control
+  * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
   * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
 * Virtualization
   * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
-- 
GitLab


From 0eac454e821d3ac34778020a434a2d07964499e3 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Fri, 19 Jun 2015 17:10:37 -0300
Subject: [PATCH 142/193] Fix listing

Project Management was not present in list, then I add and fix Project Management position.
---
 README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index da53147..a0765f5 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@
   * [Newsletter](#newsletters)
   * [NoSQL](#nosql)
   * [Packaging](#packaging)
+  * [Project Management](#project-management)
   * [Queuing](#queuing)
   * [RDBMS](#rdbms)
   * [Security](#security)
@@ -478,6 +479,20 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
 * [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
 
+## Project Management
+*Web-based project management and bug tracking systems.*
+
+* [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
+* [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
+* [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby.
+* [Gogs](http://gogs.io/) - Self-hosted Git service written in Go.
+* [OpenProject](https://www.openproject.org) - Project collaboration.
+* [Phabricator](http://phabricator.org/) Written in PHP.
+* [Redmine](http://www.redmine.org/) - Written in ruby on rails.
+* [Taiga](https://taiga.io/) - Agile Project Management Tool based on the Kanban and Scrum methods.
+* [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
+* [Trac](http://trac.edgewall.org/) - Written in python.
+
 ## Queuing
 
 * [ActiveMQ](https://activemq.apache.org/) - Java message broker.
@@ -583,20 +598,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Trinity Rescue Kit](http://trinityhome.org) - Linux Live CD for general computer troubleshooting.
 * [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
 
-## Project Management
-*Web-based project management and bug tracking systems.*
-
-* [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
-* [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
-* [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby.
-* [Gogs](http://gogs.io/) - Self-hosted Git service written in Go.
-* [OpenProject](https://www.openproject.org) - Project collaboration.
-* [Phabricator](http://phabricator.org/) Written in PHP.
-* [Redmine](http://www.redmine.org/) - Written in ruby on rails.
-* [Taiga](https://taiga.io/) - Agile Project Management Tool based on the Kanban and Scrum methods.
-* [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
-* [Trac](http://trac.edgewall.org/) - Written in python.
-
 ## Version control
 *Software versioning and revision control.*
 
-- 
GitLab


From d763211c4022de429ac3623ec411a7d585413e2e Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Fri, 19 Jun 2015 17:24:59 -0300
Subject: [PATCH 143/193] Another listing fixes

---
 README.md | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a0765f5..9ab347d 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,12 @@
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
   * [Backups](#backups)
+  * [Build and software organization tools](#build-and-software-organization-tools)
   * [ChatOps](#chatops)
   * [Client Management](#client-management)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
+  * [Cloud Orchestration](#cloud-orchestration)
   * [Cloud Storage](#cloud-storage)
   * [Code Review](#code-review)
   * [Collaborative Software](#collaborative-software)
@@ -21,6 +23,7 @@
   * [Configuration Management](#configuration-management)
   * [Continuous Integration & Continuous Deployment](#continuous-integration--continuous-deployment)
   * [Control Panels](#control-panels)
+  * [Deployment Automation](#deployment-automation)
   * [Distributed Filesystems](#distributed-filesystems)
   * [DNS](#dns)
   * [Editors](#editors)
@@ -46,7 +49,6 @@
   * [Status Pages](#status-pages)
   * [Ticketing systems](#ticketing-systems)
   * [Troubleshooting](#troubleshooting)
-  * [Project Management](#project-management)
   * [Version control](#version-control)
   * [Virtualization](#virtualization)
   * [VPN](#vpn)
@@ -93,6 +95,15 @@
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
 * [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
 
+## Build and software organization tools
+*Build and software organization tools.*
+
+* [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
+* [environment-modules Tcl](http://en.wikipedia.org/wiki/Environment_Modules_%28software%29) - .
+* [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
+* [environment-modules Tcl/C](http://modules.sourceforge.net/) - The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
+* [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
+
 ## ChatOps
 *Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
 
@@ -194,15 +205,6 @@
 * [Salt](http://www.saltstack.com/) - It's written in Python.
 * [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
 
-## Build and software organization tools
-*Build and software organization tools.*
-
-* [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
-* [environment-modules Tcl](http://en.wikipedia.org/wiki/Environment_Modules_%28software%29) - .
-* [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
-* [environment-modules Tcl/C](http://modules.sourceforge.net/) - The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
-* [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
-
 ## Continuous Integration & Continuous Deployment
 *Continuous integration/deployment software.*
 
-- 
GitLab


From ce0fe4ca925451eb27f91e958fed1414b2549284 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Mon, 22 Jun 2015 14:57:28 -0300
Subject: [PATCH 144/193] Add OpenVZ Web Panel

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9ab347d..91de3a9 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
   * [Backups](#backups)
   * [Build and software organization tools](#build-and-software-organization-tools)
   * [ChatOps](#chatops)
-  * [Client Management](#client-management)
+  * [Client Management](#client-management)C
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
   * [Cloud Orchestration](#cloud-orchestration)
@@ -235,6 +235,7 @@
 * Virtualization
   * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
   * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+  * [OpenVZ Web Panel](http://owp.softunity.com.ru/) - Web panel to control your OpenVZ servers.
   * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
   * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
 * Server
-- 
GitLab


From dff2a2d8b11abfc47f3d7277ee7fe47110c2cdfb Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Mon, 22 Jun 2015 15:01:19 -0300
Subject: [PATCH 145/193] Fix wrong character on list

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91de3a9..3eafe79 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
   * [Backups](#backups)
   * [Build and software organization tools](#build-and-software-organization-tools)
   * [ChatOps](#chatops)
-  * [Client Management](#client-management)C
+  * [Client Management](#client-management)
   * [Cloning](#cloning)
   * [Cloud Computing](#cloud-computing)
   * [Cloud Orchestration](#cloud-orchestration)
-- 
GitLab


From d4a29bce1a9f13e43827950db4998b1f931027aa Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Tue, 23 Jun 2015 12:55:38 +0200
Subject: [PATCH 146/193] changed 'other' link to sindresorhus' awesome

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3eafe79..a99d3d8 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   -->
 
 # Awesome Sysadmin
-**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/n1trux/awesome-awesomeness) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
+**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
-- 
GitLab


From 5752dfe6416107b74bc34996cd6fc2eca600d8f7 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Tue, 23 Jun 2015 09:06:42 -0300
Subject: [PATCH 147/193] add hMailServer

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a99d3d8..d44c035 100644
--- a/README.md
+++ b/README.md
@@ -377,6 +377,7 @@
 ### complete solutions
 *Software for simple deployment of a mail server, e.g. for inexperienced or impatient admins.*
 
+* [hMailServer](https://www.hmailserver.com) - Open source e-mail server for Microsoft Windows
 * [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
 * [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot.
 * [Citadel](http://www.citadel.org/) - Feature packed, easy, versatile, and powerful mail server, thanks to exclusive "rooms" based architecture.
-- 
GitLab


From c7fbcabb9613e4056483f8e0649283a123ea3f3f Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Wed, 24 Jun 2015 09:07:47 -0300
Subject: [PATCH 148/193] Add CaseBox

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d44c035..b768f0d 100644
--- a/README.md
+++ b/README.md
@@ -486,6 +486,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Project Management
 *Web-based project management and bug tracking systems.*
 
+* [CaseBox](https://www.casebox.org) - Manage all your organisation's information in one system.
 * [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
 * [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
 * [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby.
-- 
GitLab


From 4e795721c98a5483271a89d0b80d631ec9c912a6 Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Thu, 25 Jun 2015 08:48:30 -0300
Subject: [PATCH 149/193] Add WebSVN

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b768f0d..5e385a9 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@
 * Revision Control
   * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
   * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
+  * [WebSVN](http://www.websvn.info/) - Opensource web subversion repository browser.
 * Virtualization
   * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
   * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
-- 
GitLab


From 6e4bcc3cfd7b9742878072ea93f909968335cf2d Mon Sep 17 00:00:00 2001
From: Joubert RedRat <eu+github@redrat.com.br>
Date: Fri, 26 Jun 2015 14:11:22 -0300
Subject: [PATCH 150/193] Add PmWiki

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e385a9..cb228fb 100644
--- a/README.md
+++ b/README.md
@@ -678,7 +678,8 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [MDwiki](http://dynalon.github.io/mdwiki/#!index.md) - Wiki completely built in HTML5/Javascript and runs 100% on the client
 * [Mediawiki](http://www.mediawiki.org/wiki/MediaWiki) - Used to power Wikipedia.
 * [MoinMoin](http://moinmo.in/) - An advanced, easy to use and extensible WikiEngine with a large community of users.
-* [ÅŒlelo Wiki](https://github.com/minad/olelo) - A a wiki that stores pages in a Git repository.
+* [ÅŒlelo Wiki](https://github.com/minad/olelo) - A wiki that stores pages in a Git repository.
+* [PmWiki](http://www.pmwiki.org) - Wiki-based system for collaborative creation and maintenance of websites.
 * [TiddlyWiki](http://tiddlywiki.com) - Complete interactive wiki in JavaScript.
 
 # Resources
-- 
GitLab


From e913da5b73e1a7e70c4881e14d5d5dbd87e5c917 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:32:22 +0200
Subject: [PATCH 151/193] remove tarsnap: no FLOSS server

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index cb228fb..6a705dd 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,6 @@
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
 * [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
-* [TarSnap](https://www.tarsnap.com/) - Secure backup service with an open-source client.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
 * [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
-- 
GitLab


From d6fe7405969849cf860a359f36380136d18a1678 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:35:13 +0200
Subject: [PATCH 152/193] add WAPT and WPKG links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6a705dd..2b5b25f 100644
--- a/README.md
+++ b/README.md
@@ -118,8 +118,8 @@
 
 * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
 * [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
-* [WAPT] - Network-wide (un)installation, configuration and upgrades of Windows based software.
-* [WPKG] - Software deployment, upgrade and removal program for Windows.
+* [WAPT](http://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.
 
 ## Cloning
 *Cloning software.*
-- 
GitLab


From c591289872a9ae4377a050d95296e35b23585b97 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:38:04 +0200
Subject: [PATCH 153/193] rm Redo: last rel. 2012, crashes on current python2

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2b5b25f..f4c0518 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,6 @@
 
 * [Clonezilla](http://clonezilla.org/) - Partition and disk imaging/cloning program.
 * [Fog](http://www.fogproject.org/) - Another computer cloning solution.
-* [Redo Backup](http://redobackup.org/) - Easy Backup, Recovery and Restore.
 
 ## Cloud Computing
 
-- 
GitLab


From bc553d3b40e05ae7af8c3feef98acafa0c2d4fe2 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:39:36 +0200
Subject: [PATCH 154/193] fix some grammar and redundancy

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f4c0518..c4d1be7 100644
--- a/README.md
+++ b/README.md
@@ -137,10 +137,10 @@
 * [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
 * [Flynn](https://flynn.io) - PaaS
 * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
-* [OpenNebula](http://opennebula.org/) - An user-driven cloud management platform for sysadmins and devops.
-* [Openshift](http://www.openshift.org) - OpenShift is a platform as a service product from Red Hat.
-* [OpenStack](https://www.openstack.org/) - Software for building private and public clouds.
-* [The Foreman](http://theforeman.org/) - Foreman is a complete lifecycle management tool for physical and virtual servers. FOSS.
+* [OpenNebula](http://opennebula.org/) - User-driven cloud management platform for sysadmins and devops.
+* [Openshift](http://www.openshift.org) - PaaS product from Red Hat.
+* [OpenStack](https://www.openstack.org/) - Build private and public clouds.
+* [The Foreman](http://theforeman.org/) - Complete lifecycle management tool for physical and virtual servers. FOSS.
 * [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
 
 ## Cloud Orchestration
@@ -148,7 +148,7 @@
 * [BOSH](http://docs.cloudfoundry.org/bosh/) -  IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
 * [Cloudify](http://www.getcloudify.org/) -  TOSCA-based cloud orchestration software platform written in Python and YAML.
 * [CloudSlang](http://www.cloudslang.io/) -  Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
-* [Juju](https://juju.ubuntu.com/) - Cloud orechestration tool which manages services as charms, YAML configuration and deployment script bundles.
+* [Juju](https://juju.ubuntu.com/) - Cloud orchestration tool which manages services as charms, YAML configuration and deployment script bundles.
 * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
 * [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.
-- 
GitLab


From 87898c8315c7dd259bedd4b3e141b17ed0388443 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:52:56 +0200
Subject: [PATCH 155/193] rm Qpopper (dead)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c4d1be7..4ba10f8 100644
--- a/README.md
+++ b/README.md
@@ -359,7 +359,6 @@
 * [Courier IMAP/POP3](http://www.courier-mta.org/imap/) - Fast, scalable, enterprise IMAP and POP3 server.
 * [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
 * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
-* [Qpopper](http://www.eudora.com/products/unsupported/qpopper/) - One of the oldest and most popular server implementations of POP3.
 
 ### MTA (SMTP)
 *Mail Transfer Agents (SMTP servers).*
-- 
GitLab


From 874c6f0cfaba31716a3a394bf7443564baae8973 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 22:58:36 +0200
Subject: [PATCH 156/193] rm ZPanel (long live Sentora)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4ba10f8..177c655 100644
--- a/README.md
+++ b/README.md
@@ -220,7 +220,6 @@
   * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
   * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
   * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-  * [ZPanel](http://www.zpanelcp.com/) - Control panel for Linux, BSD, and Windows.
 * E-mail
   * [Postfix Admin](http://postfixadmin.sourceforge.net/) - web interface to manage postfix mailboxes, virtual domains and aliases.
 * DNS
-- 
GitLab


From 0397416ede174973a1bffd395fa0a2cace8ff479 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 27 Jun 2015 23:45:27 +0200
Subject: [PATCH 157/193] added recommendation requirement

---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6ceab5..f367d3e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # 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*.
+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.
 
 ## Commits
 * Search previous suggestions before making a new one.
@@ -14,6 +14,8 @@ This is a compilation of **Free and Libre Open Source Software ([FLOSS](https://
 * 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
 
 ## Issues
 * Discussion, questions and bug reports only.
-- 
GitLab


From ae6e0e0b6a22b9f1e9b62d8c9fcaf25c443ac8e7 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 29 Jun 2015 18:26:09 +0200
Subject: [PATCH 158/193] rm environment-modules Lmod (wtf, Wikipedia link?)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 177c655..b4e6a56 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,6 @@
 *Build and software organization tools.*
 
 * [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
-* [environment-modules Tcl](http://en.wikipedia.org/wiki/Environment_Modules_%28software%29) - .
 * [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
 * [environment-modules Tcl/C](http://modules.sourceforge.net/) - The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
 * [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
-- 
GitLab


From 5e8f6e609094523c555bb16d265fbc3adaf4829c Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Mon, 29 Jun 2015 18:10:57 +0000
Subject: [PATCH 159/193] Added Gitter badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b4e6a56..daa1ba4 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@
   -->
 
 # Awesome Sysadmin
+
+[![Join the chat at https://gitter.im/n1trux/awesome-sysadmin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/n1trux/awesome-sysadmin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
 * [Awesome Sysadmin](#awesome-sysadmin)
-- 
GitLab


From bc9575ae1f37eef118f747e34811d1824731e1f3 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 29 Jun 2015 21:15:53 +0200
Subject: [PATCH 160/193] corrected gitter badge

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index daa1ba4..71b1b02 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,10 @@
 
 # Awesome Sysadmin
 
-[![Join the chat at https://gitter.im/n1trux/awesome-sysadmin](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/n1trux/awesome-sysadmin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
+[![Join the chat at https://gitter.im/n1trux/awesome-sysadmin](https://img.shields.io/badge/gitter%20chat-join-blue.svg)](https://gitter.im/n1trux/awesome-sysadmin)
+
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
   * [Backups](#backups)
-- 
GitLab


From ad38f37bfa790b4b16f6049e77f7fa0e45e113c0 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Fri, 10 Jul 2015 05:43:33 +0200
Subject: [PATCH 161/193] replaced TRK with grml (former is dead)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71b1b02..4ccb840 100644
--- a/README.md
+++ b/README.md
@@ -597,9 +597,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Troubleshooting
 *Troubleshooting Tools.*
 
++ [grml](https://grml.org) – bootable Debian Live CD with powerful CLI tools.
 * [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
 * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
-* [Trinity Rescue Kit](http://trinityhome.org) - Linux Live CD for general computer troubleshooting.
 * [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
 
 ## Version control
-- 
GitLab


From afb8815d920ea4cf9d75f53638540b846e6f3e04 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Fri, 10 Jul 2015 05:47:15 +0200
Subject: [PATCH 162/193] rm Bacula (Bareos = awesome fork)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4ccb840..7770f62 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@
 
 * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
 * [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
-* [Bacula](http://www.bacula.org) - Another Client-server model backup tool.
 * [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
 * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
 * [Backuppc](http://backuppc.sourceforge.net/) - Client-server model backup tool with file pooling scheme.
-- 
GitLab


From 03c2b37a6d54fe889e17f1dece16010e4625af2b Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 13 Jul 2015 10:20:23 +0200
Subject: [PATCH 163/193] rm Mailpile (unstable beta)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 7770f62..b76ebe8 100644
--- a/README.md
+++ b/README.md
@@ -344,7 +344,6 @@
 ### Webmail
 *Webmail applications.*
 
-* [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
 * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
 * [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
 * [Horde](http://www.horde.org) - Webmail and groupware client
-- 
GitLab


From 964667bf9ad029959eeec1169ed7904ca85f2925 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 13 Jul 2015 10:22:50 +0200
Subject: [PATCH 164/193] rm sicekit (domain parked, last commit 2y ago)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b76ebe8..9c14dbb 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,6 @@
 * [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
 * [iTop](http://www.combodo.com/-Overview-.html) - 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.
-* [Sicekit](https://github.com/sicekit/sicekit) - The systems & infrastructure encyclopaedia toolkit (based on mediawiki).
 * [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.
 
-- 
GitLab


From ccf4cae1e3bf1658b839a9d87d2cc32bab4d2f6e Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 13 Jul 2015 10:25:13 +0200
Subject: [PATCH 165/193] rm MySQL (another Oracle fuckup)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 9c14dbb..2763686 100644
--- a/README.md
+++ b/README.md
@@ -510,7 +510,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Firebird](http://www.firebirdsql.org/) - True universal database.
 * [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
 * [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
-* [MySQL](http://dev.mysql.com/) - Most popular RDBMS server.
 * [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
 * [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
 * [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
-- 
GitLab


From 82ac6e847b5502b42b90709ea975b22d1301a602 Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Sat, 25 Jul 2015 11:23:13 -0700
Subject: [PATCH 166/193] Add rake link, strip trailing spaces

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2763686..8710107 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@
 * [Bazel](http://bazel.io/) - Google's build system.
 * [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
 * [Gradle](http://gradle.org/) - Another build automation system.
+* [Rake](https://github.com/ruby/rake) - Build automation tool similar to Make, written in and extensible in Ruby.
 
 ## Backups
 *Backup software.*
@@ -519,7 +520,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Security tools.*
 
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
-* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring. 
+* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
@@ -543,7 +544,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Operating system–level virtualization.*
 
 * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
+* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
@@ -576,7 +577,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Cachet](https://cachethq.io) - Status page system written in PHP.
 * [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
 * [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
-* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services. 
+* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
 
 ## Ticketing systems
 *Web-based ticketing system.*
-- 
GitLab


From 7f947f8e377479e05710da6918b29949cbbbf9dd Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Mon, 27 Jul 2015 11:09:06 +0200
Subject: [PATCH 167/193] rm some old stuff from sourceforge

mostly I removed software which wasn't updated since 2y+ and hosted on sourceforge. Sourceforge treats FLOSS authors badly and I don't want to support this. Re-inclusion might happen if somebody still thinks the removed stuff is awesome; feel free to create a PR in this case.
---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 2763686..0835a18 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,12 @@
 * [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
 * [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
 * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
-* [Backuppc](http://backuppc.sourceforge.net/) - Client-server model backup tool with file pooling scheme.
 * [Brebis](http://brebisproject.org) - A fully automated backup checker
 * [Burp](http://burp.grke.org/) - Network backup and restore program.
 * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
 * [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
 * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
-* [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
 * [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
 * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
 * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
@@ -101,7 +99,6 @@
 
 * [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
 * [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
-* [environment-modules Tcl/C](http://modules.sourceforge.net/) - The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles.
 * [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
 
 ## ChatOps
@@ -220,8 +217,6 @@
   * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
   * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
   * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-* E-mail
-  * [Postfix Admin](http://postfixadmin.sourceforge.net/) - web interface to manage postfix mailboxes, virtual domains and aliases.
 * DNS
   * [Atomia DNS](http://atomiadns.com/) - DNS management system.
   * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
@@ -385,7 +380,6 @@
 *Monitoring software.*
 
 * [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
-* [BandwidthD](http://bandwidthd.sourceforge.net/) - BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization.
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
 * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
-- 
GitLab


From 13b53a087ca88f4c71c3e1964d1b259f98797f1f Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Sat, 25 Jul 2015 15:17:40 +0200
Subject: [PATCH 168/193] add more backup tools: obnam, rdiff-backup

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2763686..962620f 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,8 @@
 * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
 * [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
 * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
+* [Obnam](http://obnam.org/) - An easy, secure, snapshots-based backup program with data de-duplication.
+* [Rdiff-backup](http://www.nongnu.org/rdiff-backup/) - An easy A remote incremental backup of all your files.
 * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
 * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.
 * [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
-- 
GitLab


From 3ba8696e2eb6b2915fa27a286100825326338071 Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Mon, 27 Jul 2015 07:10:06 -0700
Subject: [PATCH 169/193] Remove extra space before Userspace

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8710107..6d3c447 100644
--- a/README.md
+++ b/README.md
@@ -544,7 +544,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Operating system–level virtualization.*
 
 * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features.
+* [LXC](https://linuxcontainers.org/lxc/) - Userspace interface for the Linux kernel containment features.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
-- 
GitLab


From acb537ba9761c5bb443f8480f94179adeb59bc80 Mon Sep 17 00:00:00 2001
From: David Parlevliet <dave@leaguecraft.com>
Date: Thu, 30 Jul 2015 21:57:15 +1000
Subject: [PATCH 170/193] separated metric tools in to categories to make it
 neater and easier to find what you're looking for

---
 README.md | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 0835a18..8c5b8be 100644
--- a/README.md
+++ b/README.md
@@ -409,22 +409,31 @@
 ## Metric & Metric Collection
 *Metric gathering and display software.*
 
+### Collectors only
+* [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
 * [Collectd](http://collectd.org/) - System statistic collection daemon.
 * [Collectl](http://collectl.sourceforge.net/) - High precision system performance metrics collecting tool.
+* [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
+* [tcollector](http://opentsdb.net/docs/build/html/user_guide/utilities/tcollector.html) - System statistic collection daemon written in Python for OpenTSDB
+
+### Dashboards
+* [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
+* [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
+* [RRDtool](http://oss.oetiker.ch/rrdtool/) - Industry standard, high performance data logging and graphing system for time series data.
 * [Dashing](http://dashing.io/) - Ruby gem that allows for rapid statistical dashboard development. An all HTML5 approach allows for big screen displays in data centers or conference rooms.
-* [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
 * [Facette](http://facette.io) - Time series data visualization and graphing software written in Go.
-* [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard. Transforms raw JSON into delicious UI.
-* [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
-* [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
-* [Graphite](http://graphite.readthedocs.org/en/latest/) - Scalable graphing server.
-* [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
-* [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
+* [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard for the internet of things. Transforms raw JSON into delicious UI.
+
+### Metric storage
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
-* [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
+* [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
+* [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
+
+### Packages
 * [Prometheus](http://prometheus.io/) - Service monitoring system and time series database.
-* [RRDtool](http://oss.oetiker.ch/rrdtool/) - Industry standard, high performance data logging and graphing system for time series data.
-* [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
+* [Packetbeat](http://packetbeat.com/) - 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
 *Network configuration management tools.*
-- 
GitLab


From 0fcb079b4b94ef092bceea0f29db7352ecb63af6 Mon Sep 17 00:00:00 2001
From: David Parlevliet <dave@leaguecraft.com>
Date: Thu, 30 Jul 2015 21:57:55 +1000
Subject: [PATCH 171/193] Added tcollector for OpenTSDB

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8c5b8be..a7f171f 100644
--- a/README.md
+++ b/README.md
@@ -424,7 +424,7 @@
 * [Facette](http://facette.io) - Time series data visualization and graphing software written in Go.
 * [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard for the internet of things. Transforms raw JSON into delicious UI.
 
-### Metric storage
+### Storage
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
 * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
-- 
GitLab


From c063d65675b58ca1380a9f4906e5aebe66a079da Mon Sep 17 00:00:00 2001
From: David Parlevliet <dave@leaguecraft.com>
Date: Thu, 30 Jul 2015 22:00:43 +1000
Subject: [PATCH 172/193] use nested list instead of h3 heading to make it
 easier to read

---
 README.md | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index a7f171f..d336943 100644
--- a/README.md
+++ b/README.md
@@ -409,31 +409,30 @@
 ## Metric & Metric Collection
 *Metric gathering and display software.*
 
-### Collectors only
-* [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
-* [Collectd](http://collectd.org/) - System statistic collection daemon.
-* [Collectl](http://collectl.sourceforge.net/) - High precision system performance metrics collecting tool.
-* [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
-* [tcollector](http://opentsdb.net/docs/build/html/user_guide/utilities/tcollector.html) - System statistic collection daemon written in Python for OpenTSDB
-
-### Dashboards
-* [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
-* [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
-* [RRDtool](http://oss.oetiker.ch/rrdtool/) - Industry standard, high performance data logging and graphing system for time series data.
-* [Dashing](http://dashing.io/) - Ruby gem that allows for rapid statistical dashboard development. An all HTML5 approach allows for big screen displays in data centers or conference rooms.
-* [Facette](http://facette.io) - Time series data visualization and graphing software written in Go.
-* [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard for the internet of things. Transforms raw JSON into delicious UI.
-
-### Storage
-* [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
-* [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
-* [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
-
-### Packages
-* [Prometheus](http://prometheus.io/) - Service monitoring system and time series database.
-* [Packetbeat](http://packetbeat.com/) - Captures network traffic and displays it in a custom Kibana dashboard for easy viewing.
-* [Graphite](http://graphite.readthedocs.org/en/latest/) - Scalable graphing server.
-
+* Collectors only
+  * [Diamond](https://github.com/BrightcoveOS/Diamond) - Python based statistic collection daemon.
+  * [Collectd](http://collectd.org/) - System statistic collection daemon.
+  * [Collectl](http://collectl.sourceforge.net/) - High precision system performance metrics collecting tool.
+  * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
+  * [tcollector](http://opentsdb.net/docs/build/html/user_guide/utilities/tcollector.html) - System statistic collection daemon written in Python for OpenTSDB
+
+* Dashboards
+  * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
+  * [Ganglia](http://ganglia.sourceforge.net/) - High performance, scalable RRD based monitoring for grids and/or clusters of servers. Compatible with Graphite using a single collection process.
+  * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Industry standard, high performance data logging and graphing system for time series data.
+  * [Dashing](http://dashing.io/) - Ruby gem that allows for rapid statistical dashboard development. An all HTML5 approach allows for big screen displays in data centers or conference rooms.
+  * [Facette](http://facette.io) - Time series data visualization and graphing software written in Go.
+  * [Freeboard](https://github.com/Freeboard/freeboard) - A damn-sexy front-end real-time dashboard for the internet of things. Transforms raw JSON into delicious UI.
+
+* Storage
+  * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
+  * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
+  * [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
+
+* Packages
+  * [Prometheus](http://prometheus.io/) - Service monitoring system and time series database.
+  * [Packetbeat](http://packetbeat.com/) - 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
 *Network configuration management tools.*
-- 
GitLab


From 76051615932db94a9242dc3ef895d699f1beee1f Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 1 Aug 2015 23:53:49 +0200
Subject: [PATCH 173/193] add awesome badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0835a18..271d7ae 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
   Author: n1trux
   -->
 
-# Awesome Sysadmin
+# Awesome Sysadmin [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
 
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
-- 
GitLab


From d22594f55cb168f231c82ed07a028a5b14df6a70 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Sat, 1 Aug 2015 23:56:36 +0200
Subject: [PATCH 174/193] removed Analog (closes #91)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 271d7ae..7b57609 100644
--- a/README.md
+++ b/README.md
@@ -558,7 +558,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 ## Statistics
 *Analytics software.*
 
-* [Analog](http://www.analog.cx/) - Logfile Analyser.
 * [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
 * [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
 * [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
-- 
GitLab


From 34ddb33b60b268e58731236df8d9687f3a77a247 Mon Sep 17 00:00:00 2001
From: n1trux <n1trux@users.noreply.github.com>
Date: Mon, 3 Aug 2015 15:48:38 +0200
Subject: [PATCH 175/193] moved badges

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2c6ed85..88e598d 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@
   Author: n1trux
   -->
 
-# Awesome Sysadmin [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+# Awesome Sysadmin
 
 **A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
 
-[![Join the chat at https://gitter.im/n1trux/awesome-sysadmin](https://img.shields.io/badge/gitter%20chat-join-blue.svg)](https://gitter.im/n1trux/awesome-sysadmin)
+[![certified awesome!](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![Join the Gitter chat](https://img.shields.io/badge/gitter%20chat-join-blue.svg)](https://gitter.im/n1trux/awesome-sysadmin)
 
 * [Awesome Sysadmin](#awesome-sysadmin)
   * [Automation](#automation)
-- 
GitLab


From 542c2f248f84f9195f563c89eb096eb19d04729a Mon Sep 17 00:00:00 2001
From: Michael Beasley <youvegotmoxie@gmail.com>
Date: Tue, 4 Aug 2015 19:48:05 -0400
Subject: [PATCH 176/193] Add: Security - Nmap

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 88e598d..e67285f 100644
--- a/README.md
+++ b/README.md
@@ -515,7 +515,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Security tools.*
 
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
-* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring. 
+* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
@@ -527,6 +527,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
 * [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
 * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
+* [Nmap](https://nmap.org) - Nmap is a free and open source utility for network discovery and security auditing. 
 
 ## Service Discovery
 
@@ -539,7 +540,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Operating system–level virtualization.*
 
 * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
+* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
@@ -571,7 +572,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Cachet](https://cachethq.io) - Status page system written in PHP.
 * [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
 * [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
-* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services. 
+* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
 
 ## Ticketing systems
 *Web-based ticketing system.*
-- 
GitLab


From 1518b202767d93e57e0e9b8545593b89711d3fe6 Mon Sep 17 00:00:00 2001
From: Michael Beasley <youvegotmoxie@gmail.com>
Date: Tue, 4 Aug 2015 20:03:44 -0400
Subject: [PATCH 177/193] Add: Editors - Nano

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e67285f..8f3d87a 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@
 * [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
 * [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.
+* [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
 
 ## Identity Management
 *LDAP servers and other tools to manage accounts and identities.*
-- 
GitLab


From 9e6f12e664f425ba2b7018aebc95f17cd62bc224 Mon Sep 17 00:00:00 2001
From: n1trux <n1trux@users.noreply.github.com>
Date: Wed, 5 Aug 2015 14:58:41 +0200
Subject: [PATCH 178/193] added donation plea

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 88e598d..c246b58 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 # Awesome Sysadmin
 
-**A curated list of amazingly awesome open source sysadmin resources.** You can check out [other awesome lists](https://github.com/sindresorhus/awesome) as well. Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
+**A curated list of amazingly awesome open source sysadmin resources.** Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software and consider [donating](https://github.com/n1trux/awesome-donations) to the FLOSS projects you use regularly.
 
 [![certified awesome!](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [![Join the Gitter chat](https://img.shields.io/badge/gitter%20chat-join-blue.svg)](https://gitter.im/n1trux/awesome-sysadmin)
 
-- 
GitLab


From a68a4293ff6286862dede3c863eb81d8bafdf11b Mon Sep 17 00:00:00 2001
From: Oscar Gatamah <gatamah@gmail.com>
Date: Tue, 11 Aug 2015 19:56:13 +0300
Subject: [PATCH 179/193] Add README.md

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c246b58..5890866 100644
--- a/README.md
+++ b/README.md
@@ -515,7 +515,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Security tools.*
 
 * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
-* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring. 
+* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
 * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
 * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
 * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
@@ -539,7 +539,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 *Operating system–level virtualization.*
 
 * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features. 
+* [LXC](https://linuxcontainers.org/lxc/) -  Userspace interface for the Linux kernel containment features.
 * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
@@ -571,7 +571,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Cachet](https://cachethq.io) - Status page system written in PHP.
 * [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
 * [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
-* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services. 
+* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
 
 ## Ticketing systems
 *Web-based ticketing system.*
@@ -610,6 +610,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
+* [OpenNode](http://opennodecloud.com) - OpenNode builds open-source infrastructure management software and implements cloud systems.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
 * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
-- 
GitLab


From efcb6accba30f708b6c117991f719c9bf900a65f Mon Sep 17 00:00:00 2001
From: Oscar Gatamah <gatamah@gmail.com>
Date: Tue, 11 Aug 2015 20:10:36 +0300
Subject: [PATCH 180/193] Added OpenNode

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5890866..23ced98 100644
--- a/README.md
+++ b/README.md
@@ -610,7 +610,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
 * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
 * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
-* [OpenNode](http://opennodecloud.com) - OpenNode builds open-source infrastructure management software and implements cloud systems.
+* [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems.
 * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
 * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
 * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
-- 
GitLab


From e2ef7ba3709b17a42dac63fad920ba78fd147172 Mon Sep 17 00:00:00 2001
From: muffl0n <sven@schliesing.de>
Date: Wed, 12 Aug 2015 08:33:05 +0200
Subject: [PATCH 181/193] Change Google Code URLs

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4b8f9cb..4dac23a 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 ## Code Review
 *Web Based collaborative code review system.*
 
-* [Gerrit](https://code.google.com/p/gerrit/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
+* [Gerrit](https://www.gerritcodereview.com/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
 * [Review Board](https://www.reviewboard.org/) - Available as free software uner the MIT License.
 
 ## Collaborative Software
@@ -264,7 +264,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Grafana](http://grafana.org/) - A Graphite & InfluxDB Dashboard and Graph Editor.
 * [Graphite](http://graphite.readthedocs.org/en/latest/) - Open source scaleable graphing server.
 * [InfluxDB](http://influxdb.com/) - Open source distributed time series database with no external dependencies.
-* [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
+* [KairosDB](https://github.com/kairosdb/kairosdb) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
 * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
 * [RRDtool](http://oss.oetiker.ch/rrdtool/) - Open source industry standard, high performance data logging and graphing system for time series data.
 * [Statsd](https://github.com/etsy/statsd/) - Application statistic listener.
@@ -299,7 +299,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
   * [FlockDB](https://github.com/twitter/flockdb) - Twitter's distributed, fault-tolerant graph database.
   * [Neo4j](http://www.neo4j.org/) - Open source graph database.
 * Key-Value
-  * [LevelDB](https://code.google.com/p/leveldb/) - Google's high performance key/value database.
+  * [LevelDB](https://github.com/google/leveldb) - Google's high performance key/value database.
   * [Redis](http://redis.io/) - Networked, in-memory, key-value data store with optional durability.
   * [Riak](http://basho.com/riak/) - Another fault-tolerant key-value NoSQL database.
 
-- 
GitLab


From debb88df6098679aec179465791e6011dca0f390 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 21 Aug 2015 19:24:10 +0200
Subject: [PATCH 182/193] add adagios part of
 https://github.com/Kickball/awesome-selfhosted/issues/127

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4a90989..dec3569 100644
--- a/README.md
+++ b/README.md
@@ -382,6 +382,7 @@
 ## Monitoring
 *Monitoring software.*
 
+* [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki))
 * [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
 * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
 * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
-- 
GitLab


From 0c3ca67b24e0e532e258571124f02890c4cc9253 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 21 Aug 2015 19:27:39 +0200
Subject: [PATCH 183/193] add adminer part of
 https://github.com/Kickball/awesome-selfhosted/issues/127

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4a90989..4524a6e 100644
--- a/README.md
+++ b/README.md
@@ -507,6 +507,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [Firebird](http://www.firebirdsql.org/) - True universal database.
 * [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
 * [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
+  * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
 * [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
 * [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
 * [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
-- 
GitLab


From bfd6f301b2c2b1bfb88551cb56776584d856ab3b Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 21 Aug 2015 19:45:12 +0200
Subject: [PATCH 184/193] add Linux Dash part of
 https://github.com/Kickball/awesome-selfhosted/issues/127

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4a90989..26264c0 100644
--- a/README.md
+++ b/README.md
@@ -392,6 +392,7 @@
 * [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
 * [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
 * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
+* [Linux Dash](https://github.com/afaqurk/linux-dash) - A simple, low-overhead web dashboard for GNU / Linux. (~1MB) ([Demo](http://linuxdash.afaqtariq.com/))
 * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
 * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
 * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
-- 
GitLab


From c5c9b123baefcca707f42c56b3717a6e34d71792 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 21 Aug 2015 20:01:26 +0200
Subject: [PATCH 185/193] move email software to awesome-selfhosted part of
 https://github.com/Kickball/awesome-selfhosted/issues/127

---
 README.md | 42 +++---------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 4a90989..07fa54a 100644
--- a/README.md
+++ b/README.md
@@ -338,46 +338,10 @@
 * [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
 * [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
 
-### Webmail
-*Webmail applications.*
-
-* [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
-* [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
-* [Horde](http://www.horde.org) - Webmail and groupware client
-* [Rainloop](http://www.rainloop.net) - Very nice webmail with IMAP/SMTP Support and multi accounting
-
-## Mail Servers
-*Software for setting up mail servers.*
-
-### MDA (IMAP/POP3)
-*Mail Delivery Agents (IMAP/POP3 software).*
-
-* [Courier IMAP/POP3](http://www.courier-mta.org/imap/) - Fast, scalable, enterprise IMAP and POP3 server.
-* [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
-* [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
-
-### MTA (SMTP)
-*Mail Transfer Agents (SMTP servers).*
-
-* [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge.
-* [Haraka](http://haraka.github.io/) - A high-performance, pluginable SMTP server written in JavaScript.
-* [MailCatcher](http://mailcatcher.me/) - Ruby gem that deploys a simply SMTP MTA gateway that accepts all mail and displays in web interface. Useful for debugging or development.
-* [Maildrop](https://github.com/m242/maildrop) - Disposable email SMTP server, also useful for development.
-* [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project.
-* [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement.
-* [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
-* [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA).
-
-### complete solutions
-*Software for simple deployment of a mail server, e.g. for inexperienced or impatient admins.*
-
-* [hMailServer](https://www.hmailserver.com) - Open source e-mail server for Microsoft Windows
-* [Mail-in-a-Box](https://mailinabox.email/) - Take back control of your email with this easy-to-deploy mail server in a box.
-* [iRedMail](http://www.iredmail.org/) - Full-featured mail server solution based on Postfix and Dovecot.
-* [Citadel](http://www.citadel.org/) - Feature packed, easy, versatile, and powerful mail server, thanks to exclusive "rooms" based architecture.
-* [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface.
-* [Fufix](https://www.debinux.de/fufix/) - Fufix is a mailserver installer based on Dovecot, Postfix, Postfixadmin, Nginx, PHP, MySQL and Fail2ban.
 
+## Mail servers/webmail
+
+See https://github.com/kickball/awesome-selfhosted#email
 
 ## Monitoring
 *Monitoring software.*
-- 
GitLab


From 45a098dc123c8b41653b5753c9d7cacacad02982 Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 26 Aug 2015 00:45:52 +0200
Subject: [PATCH 186/193] KairosDB moved from google to github, closes #101

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a13054..e60810c 100644
--- a/README.md
+++ b/README.md
@@ -432,7 +432,7 @@
 
 * Storage
   * [OpenTSDB](http://opentsdb.net/) - Store and server massive amounts of time series data without losing granularity.
-  * [KairosDB](https://code.google.com/p/kairosdb/) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
+  * [KairosDB](https://github.com/kairosdb/kairosdb) - Fast distributed scalable time series database, fork of OpenTSDB 1.x.
   * [InfluxDB](http://influxdb.com/) - Distributed time series database with no external dependencies.
 
 * Packages
-- 
GitLab


From 63a51f96ec78f8e590d5ce9408017b759215fed4 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Tue, 1 Sep 2015 17:35:40 +0200
Subject: [PATCH 187/193] Point project management section to
 awesome-selfhosted

Part of https://github.com/Kickball/awesome-selfhosted/issues/127
---
 README.md | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/README.md b/README.md
index ead81a9..b793c58 100644
--- a/README.md
+++ b/README.md
@@ -452,19 +452,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 * [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
 
 ## Project Management
-*Web-based project management and bug tracking systems.*
-
-* [CaseBox](https://www.casebox.org) - Manage all your organisation's information in one system.
-* [ChiliProject](https://www.chiliproject.org) - Fork of Redmine.
-* [GitBucket](https://github.com/takezoe/gitbucket) Clone of GitHub written in Scala; single jar install.
-* [GitLab](https://www.gitlab.com/) - Clone of GitHub written in Ruby.
-* [Gogs](http://gogs.io/) - Self-hosted Git service written in Go.
-* [OpenProject](https://www.openproject.org) - Project collaboration.
-* [Phabricator](http://phabricator.org/) Written in PHP.
-* [Redmine](http://www.redmine.org/) - Written in ruby on rails.
-* [Taiga](https://taiga.io/) - Agile Project Management Tool based on the Kanban and Scrum methods.
-* [The Bug Genie](http://www.thebuggenie.com/) - Written in PHP.
-* [Trac](http://trac.edgewall.org/) - Written in python.
+*Web-based project management and bug tracking systems*: see https://github.com/Kickball/awesome-selfhosted#project-management
 
 ## Queuing
 
-- 
GitLab


From b2b34c720049c78eab414ec508262c7ba097afb0 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Tue, 1 Sep 2015 17:42:37 +0200
Subject: [PATCH 188/193] point wikis section to awesome-selfhosted

Part of https://github.com/Kickball/awesome-selfhosted/issues/127
---
 README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ead81a9..e0c99f8 100644
--- a/README.md
+++ b/README.md
@@ -640,15 +640,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Wiki Software
 
-* [DokuWiki](https://www.dokuwiki.org/dokuwiki) - Simple to use and highly versatile wiki that doesn't require a database.
-* [Gollum](https://github.com/gollum/gollum) - A simple, Git-powered wiki with a sweet API and local frontend.
-* [ikiwiki](http://ikiwiki.info/) - A wiki compiler.
-* [MDwiki](http://dynalon.github.io/mdwiki/#!index.md) - Wiki completely built in HTML5/Javascript and runs 100% on the client
-* [Mediawiki](http://www.mediawiki.org/wiki/MediaWiki) - Used to power Wikipedia.
-* [MoinMoin](http://moinmo.in/) - An advanced, easy to use and extensible WikiEngine with a large community of users.
-* [ÅŒlelo Wiki](https://github.com/minad/olelo) - A wiki that stores pages in a Git repository.
-* [PmWiki](http://www.pmwiki.org) - Wiki-based system for collaborative creation and maintenance of websites.
-* [TiddlyWiki](http://tiddlywiki.com) - Complete interactive wiki in JavaScript.
+See https://github.com/Kickball/awesome-selfhosted#wikis
 
 # Resources
 Various resources, such as books, websites and articles, for improving your skills and knowledge.
-- 
GitLab


From e26d8590168c99279d6aee6a282747857a0007ea Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 2 Sep 2015 13:53:02 +0200
Subject: [PATCH 189/193] add Bosun, cadvisor, Kubernetes; Icinga description.
 Remove some unneccessary spaces, instead add indentation. harr harr, now this
 repo is incompatible with kahun's.

---
 README.md | 723 +++++++++++++++++++++++++++---------------------------
 1 file changed, 363 insertions(+), 360 deletions(-)

diff --git a/README.md b/README.md
index 722b326..91b9f43 100644
--- a/README.md
+++ b/README.md
@@ -70,274 +70,275 @@
 ## Automation
 *Automation build.*
 
-* [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
-* [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
-* [Bazel](http://bazel.io/) - Google's build system.
-* [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
-* [Gradle](http://gradle.org/) - Another build automation system.
-* [Rake](https://github.com/ruby/rake) - Build automation tool similar to Make, written in and extensible in Ruby.
+  * [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
+  * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
+  * [Bazel](http://bazel.io/) - Google's build system.
+  * [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
+  * [Gradle](http://gradle.org/) - Another build automation system.
+  * [Rake](https://github.com/ruby/rake) - Build automation tool similar to Make, written in and extensible in Ruby.
 
 ## Backups
 *Backup software.*
 
-* [Amanda](http://www.amanda.org/) - Client-server model backup tool.
-* [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
-* [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
-* [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
-* [Brebis](http://brebisproject.org) - A fully automated backup checker
-* [Burp](http://burp.grke.org/) - Network backup and restore program.
-* [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
-* [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
-* [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
-* [Obnam](http://obnam.org/) - An easy, secure, snapshots-based backup program with data de-duplication.
-* [Rdiff-backup](http://www.nongnu.org/rdiff-backup/) - An easy A remote incremental backup of all your files.
-* [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
-* [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
-* [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
-* [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
-* [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
+  * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
+  * [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
+  * [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
+  * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
+  * [Brebis](http://brebisproject.org) - A fully automated backup checker
+  * [Burp](http://burp.grke.org/) - Network backup and restore program.
+  * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
+  * [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
+  * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
+  * [Obnam](http://obnam.org/) - An easy, secure, snapshots-based backup program with data de-duplication.
+  * [Rdiff-backup](http://www.nongnu.org/rdiff-backup/) - An easy A remote incremental backup of all your files.
+  * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
+  * [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
+  * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
+  * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
+  * [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
 
 ## Build and software organization tools
 *Build and software organization tools.*
 
-* [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
-* [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
-* [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
+  * [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
+  * [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
+  * [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
 
 ## ChatOps
 *Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
 
-* [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable Python IRC bot.
-* [Eggdrop](http://www.eggheads.org/) - the world's most popular IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
-* [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
-* [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
-* [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
-* [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
+  * [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable Python IRC bot.
+  * [Eggdrop](http://www.eggheads.org/) - the world's most popular IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
+  * [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
+  * [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
+  * [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
+  * [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
 
 ## Client management
 *Managing software on desktop computers.*
 
-* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
-* [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
-* [WAPT](http://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.
+  * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
+  * [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
+  * [WAPT](http://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.
 
 ## Cloning
 *Cloning software.*
 
-* [Clonezilla](http://clonezilla.org/) - Partition and disk imaging/cloning program.
-* [Fog](http://www.fogproject.org/) - Another computer cloning solution.
+  * [Clonezilla](http://clonezilla.org/) - Partition and disk imaging/cloning program.
+  * [Fog](http://www.fogproject.org/) - Another computer cloning solution.
 
 ## Cloud Computing
 
-* [AppScale](http:/github.com/AppScale/appscale) - Cloud software with Google App Engine compatibility.
-* [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
-* [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
-* [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
-* [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
-* [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
-* [Flynn](https://flynn.io) - PaaS
-* [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
-* [OpenNebula](http://opennebula.org/) - User-driven cloud management platform for sysadmins and devops.
-* [Openshift](http://www.openshift.org) - PaaS product from Red Hat.
-* [OpenStack](https://www.openstack.org/) - Build private and public clouds.
-* [The Foreman](http://theforeman.org/) - Complete lifecycle management tool for physical and virtual servers. FOSS.
-* [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
+  * [AppScale](http:/github.com/AppScale/appscale) - Cloud software with Google App Engine compatibility.
+  * [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
+  * [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
+  * [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
+  * [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
+  * [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
+  * [Flynn](https://flynn.io) - PaaS
+  * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
+  * [OpenNebula](http://opennebula.org/) - User-driven cloud management platform for sysadmins and devops.
+  * [Openshift](http://www.openshift.org) - PaaS product from Red Hat.
+  * [OpenStack](https://www.openstack.org/) - Build private and public clouds.
+  * [The Foreman](http://theforeman.org/) - Complete lifecycle management tool for physical and virtual servers. FOSS.
+  * [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
 
 ## Cloud Orchestration
 
-* [BOSH](http://docs.cloudfoundry.org/bosh/) -  IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
-* [Cloudify](http://www.getcloudify.org/) -  TOSCA-based cloud orchestration software platform written in Python and YAML.
-* [CloudSlang](http://www.cloudslang.io/) -  Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
-* [Juju](https://juju.ubuntu.com/) - Cloud orchestration tool which manages services as charms, YAML configuration and deployment script bundles.
-* [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
-* [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://www.saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
-* [StackStorm](http://stackstorm.com/) - Event Driven Operations and ChatOps platform for infrastructure management. Written in Python
+  * [BOSH](http://docs.cloudfoundry.org/bosh/) - IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
+  * [Cloudify](http://www.getcloudify.org/) - TOSCA-based cloud orchestration software platform written in Python and YAML.
+  * [CloudSlang](http://www.cloudslang.io/) - Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
+  * [Juju](https://juju.ubuntu.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/v1.0/)) `Apache` `Go`
+  * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
+  * [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://www.saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
+  * [StackStorm](http://stackstorm.com/) - Event Driven Operations and ChatOps platform for infrastructure management. Written in Python
 
 ## Cloud Storage
 
-* [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
-* [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
-* [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature solution for file sharing and synchronization.
-* [Seafile](http://seafile.com) - Another Cloud Storage solution.
-* [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
-* [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-* [Syncthing](http://syncthing.net/) - System for private, encrypted and authenticated distribution of data.
+  * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
+  * [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
+  * [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature solution for file sharing and synchronization.
+  * [Seafile](http://seafile.com) - Another Cloud Storage solution.
+  * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
+  * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
+  * [Syncthing](http://syncthing.net/) - System for private, encrypted and authenticated distribution of data.
 
 ## Code Review
 *Web Based collaborative code review system.*
 
-* [Gerrit](https://www.gerritcodereview.com/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
-* [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
-* [Review Board](https://www.reviewboard.org/) - Available as free software under the MIT License.
+  * [Gerrit](https://www.gerritcodereview.com/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
+  * [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
+  * [Review Board](https://www.reviewboard.org/) - Available as free software under the MIT License.
 
 ## Collaborative Software
 *Collaborative software or groupware suites.*
 
-* [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs.
-* [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP.
-* [Horde Groupware](http://www.horde.org/apps/groupware) - PHP based collaborative software suite that includes email, calendars, wikis, time tracking and file management.
-* [Kolab](https://www.kolab.org) - Another groupware suite.
-* [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability.
-* [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client.
+  * [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs.
+  * [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP.
+  * [Horde Groupware](http://www.horde.org/apps/groupware) - PHP based collaborative software suite that includes email, calendars, wikis, time tracking and file management.
+  * [Kolab](https://www.kolab.org) - Another groupware suite.
+  * [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability.
+  * [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client.
 
 ## Configuration Management Database
 *Configuration management database (CMDB) software.*
 
-* [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
-* [iTop](http://www.combodo.com/-Overview-.html) - 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.
+  * [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
+  * [iTop](http://www.combodo.com/-Overview-.html) - 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.
 
 ## Configuration Management
 *Configuration management tools.*
 
-* [Ansible](http://www.ansibleworks.com/) -  It's written in Python and manages the nodes over SSH.
-* [CFEngine](http://cfengine.com/) - Lightweight agent system. Configuration state is specified via a declarative language.
-* [Chef](http://www.opscode.com/chef/) - It's written in Ruby and Erlang and uses a pure-Ruby DSL.
-* [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL.
-* [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL.
-* [Salt](http://www.saltstack.com/) - It's written in Python.
-* [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
+  * [Ansible](http://www.ansibleworks.com/) -  It's written in Python and manages the nodes over SSH.
+  * [CFEngine](http://cfengine.com/) - Lightweight agent system. Configuration state is specified via a declarative language.
+  * [Chef](http://www.opscode.com/chef/) - It's written in Ruby and Erlang and uses a pure-Ruby DSL.
+  * [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL.
+  * [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL.
+  * [Salt](http://www.saltstack.com/) - It's written in Python.
+  * [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
 
 ## Continuous Integration & Continuous Deployment
 *Continuous integration/deployment software.*
 
-* [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
-* [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
-* [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
-* [Go](http://www.go.cd/) - Continuous delivery server.
-* [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
+  * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
+  * [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
+  * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
+  * [Go](http://www.go.cd/) - Continuous delivery server.
+  * [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
 
 ## Control Panels
 *Web hosting and server or service control panels*
 
-* Web hosting
-  * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-  * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
-  * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
-  * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-* DNS
-  * [Atomia DNS](http://atomiadns.com/) - DNS management system.
-  * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
-  * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
-* Revision Control
-  * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
-  * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
-  * [WebSVN](http://www.websvn.info/) - Opensource web subversion repository browser.
-* Virtualization
-  * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
-  * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
-  * [OpenVZ Web Panel](http://owp.softunity.com.ru/) - Web panel to control your OpenVZ servers.
-  * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-  * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
-* Server
-  * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
-  * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
-  * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
-  * [Webmin](http://www.webmin.com/) - Linux server control panel.
-* Others
+  * Web hosting
+    * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
+    * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+    * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
+    * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
+  * DNS
+    * [Atomia DNS](http://atomiadns.com/) - DNS management system.
+    * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
+    * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
+  * Revision Control
+    * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
+    * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
+    * [WebSVN](http://www.websvn.info/) - Opensource web subversion repository browser.
+  * Virtualization
+    * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
+    * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+    * [OpenVZ Web Panel](http://owp.softunity.com.ru/) - Web panel to control your OpenVZ servers.
+    * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
+    * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
+  * Server
+    * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
+    * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
+    * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
+    * [Webmin](http://www.webmin.com/) - Linux server control panel.
+  * Others
 
 ## Deployment Automation
 *Tools and scripts to support deployments to your servers.*
 
-* [Capistrano](http://www.capistranorb.com) - Deploy your application to any number of machines simultaneously, in sequence or as a rolling set via SSH (rake based).
-* [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
-* [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (rake based).
-* [Rocketeer](http://rocketeer.autopergamene.eu/) - PHP task runner and deployment tool.
-* [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation (rake based).
+  * [Capistrano](http://www.capistranorb.com) - Deploy your application to any number of machines simultaneously, in sequence or as a rolling set via SSH (rake based).
+  * [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
+  * [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (rake based).
+  * [Rocketeer](http://rocketeer.autopergamene.eu/) - PHP task runner and deployment tool.
+  * [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation (rake based).
 
 ## Distributed Filesystems
 *Network distributed filesystems.*
 
-* [Ceph](http://ceph.com/) - Distributed object store and file system.
-* [DRBD](http://www.drbd.org/) - Distributed Replicated Block Device.
-* [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
-* [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
-* [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
-* [Lustre](http://lustre.opensfs.org/) - Parallel distributed file system, generally used for large-scale cluster computing.
-* [MooseFS](http://www.moosefs.org/) - Fault tolerant, network distributed file system.
-* [MogileFS](http://mogilefs.org/) - Application level, network distributed file system.
-* [OpenAFS](http://www.openafs.org/) - Distributed network file system with read-only replicas and multi-OS support.
-* [TahoeLAFS](https://tahoe-lafs.org/trac/tahoe-lafs) - secure, decentralized, fault-tolerant, peer-to-peer distributed data store and distributed file system.
-* [XtreemFS](http://www.xtreemfs.org/) - XtreemFS is a fault-tolerant distributed file system for all storage needs.
+  * [Ceph](http://ceph.com/) - Distributed object store and file system.
+  * [DRBD](http://www.drbd.org/) - Distributed Replicated Block Device.
+  * [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
+  * [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
+  * [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
+  * [Lustre](http://lustre.opensfs.org/) - Parallel distributed file system, generally used for large-scale cluster computing.
+  * [MooseFS](http://www.moosefs.org/) - Fault tolerant, network distributed file system.
+  * [MogileFS](http://mogilefs.org/) - Application level, network distributed file system.
+  * [OpenAFS](http://www.openafs.org/) - Distributed network file system with read-only replicas and multi-OS support.
+  * [TahoeLAFS](https://tahoe-lafs.org/trac/tahoe-lafs) - secure, decentralized, fault-tolerant, peer-to-peer distributed data store and distributed file system.
+  * [XtreemFS](http://www.xtreemfs.org/) - XtreemFS is a fault-tolerant distributed file system for all storage needs.
 
 ## DNS
 *DNS servers.*
 
-* [Bind](https://www.isc.org/downloads/bind/) - The most widely used name server software.
-* [djbdns](http://cr.yp.to/djbdns.html) - A collection of DNS applications, including tinydns.
-* [Designate](https://wiki.openstack.org/wiki/Designate) - DNS REST API that support several DNS servers as its backend.
-* [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) - A lightweight service providing DNS, DHCP and TFTP services to small-scale networks.
-* [Knot](https://www.knot-dns.cz/) - High performance authoritative-only DNS server.
-* [NSD](http://www.nlnetlabs.nl/projects/nsd/) - Authoritative only, high performance, simple name server.
-* [PowerDNS](https://www.powerdns.com/) - DNS server with a variety of data storage back-ends and load balancing features.
-* [Unbound](http://unbound.net/) - Validating, recursive, and caching DNS resolver.
-* [Yadifa](http://yadifa.eu/) - Lightweight authoritative Name Server with DNSSEC capabilities powering the .eu top-level domain.
+  * [Bind](https://www.isc.org/downloads/bind/) - The most widely used name server software.
+  * [djbdns](http://cr.yp.to/djbdns.html) - A collection of DNS applications, including tinydns.
+  * [Designate](https://wiki.openstack.org/wiki/Designate) - DNS REST API that support several DNS servers as its backend.
+  * [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) - A lightweight service providing DNS, DHCP and TFTP services to small-scale networks.
+  * [Knot](https://www.knot-dns.cz/) - High performance authoritative-only DNS server.
+  * [NSD](http://www.nlnetlabs.nl/projects/nsd/) - Authoritative only, high performance, simple name server.
+  * [PowerDNS](https://www.powerdns.com/) - DNS server with a variety of data storage back-ends and load balancing features.
+  * [Unbound](http://unbound.net/) - Validating, recursive, and caching DNS resolver.
+  * [Yadifa](http://yadifa.eu/) - Lightweight authoritative Name Server with DNSSEC capabilities powering the .eu top-level domain.
 
 ## Editors
 *Open source code editors.*
 
-* [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://eclipse.org/) - IDE written in Java with an extensible plug-in system.
-* [Geany](http://www.geany.org/) - GTK2 text editor.
-* [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
-* [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
-* [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
-* [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://www.lighttable.com/) - The next generation code editor.
-* [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
-* [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.
-* [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
+  * [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://eclipse.org/) - IDE written in Java with an extensible plug-in system.
+  * [Geany](http://www.geany.org/) - GTK2 text editor.
+  * [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
+  * [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
+  * [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
+  * [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://www.lighttable.com/) - The next generation code editor.
+  * [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
+  * [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.
+  * [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
 
 ## Identity Management
 *LDAP servers and other tools to manage accounts and identities.*
 
 ### LDAP
-* [389 Directory Server](http://port389.org) - Developed by Red Hat.
-* [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
-* [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
-* [OpenDS](https://opends.java.net/) - Another directory server written in Java.
-* [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
+  * [389 Directory Server](http://port389.org) - Developed by Red Hat.
+  * [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
+  * [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
+  * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
+  * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
 
 ### Tools and web interfaces
-* [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
-* [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
-* [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
-* [Samba](https://www.samba.org/) – Active Directory and CIFS protocol implementation.
+  * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
+  * [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
+  * [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
+  * [Samba](https://www.samba.org/) – Active Directory and CIFS protocol implementation.
 
 ## IT Asset Management
 *IT Assets Management software.*
 
-* [GLPI](http://www.glpi-project.org/spip.php?lang=en) - Information Resource-Manager with an additional Administration Interface.
-* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Enables users to inventory their IT assets.
-* [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration.
-* [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
-* [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
+  * [GLPI](http://www.glpi-project.org/spip.php?lang=en) - Information Resource-Manager with an additional Administration Interface.
+  * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Enables users to inventory their IT assets.
+  * [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration.
+  * [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
+  * [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
 
 ## Log Management
 *Log management tools: collect, parse, visualize ...*
 
-* [Elasticsearch](http://www.elasticsearch.org/) - A Lucene Based Document store mainly used for log indexing, storage and analysis.
-* [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper.
-* [Flume](https://flume.apache.org/) - Distributed log collection and aggregation system.
-* [Graylog2](http://graylog2.org/) - Pluggable Log and Event Analysis Server with Alerting options.
-* [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
-* [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
-* [Logstash](http://logstash.net/) - Tool for managing events and logs.
-* [Octopussy](http://www.octopussy.pm) - Log Management Solution (Visualize / Alert / Report).
+  * [Elasticsearch](http://www.elasticsearch.org/) - A Lucene Based Document store mainly used for log indexing, storage and analysis.
+  * [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper.
+  * [Flume](https://flume.apache.org/) - Distributed log collection and aggregation system.
+  * [Graylog2](http://graylog2.org/) - Pluggable Log and Event Analysis Server with Alerting options.
+  * [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
+  * [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
+  * [Logstash](http://logstash.net/) - Tool for managing events and logs.
+  * [Octopussy](http://www.octopussy.pm) - Log Management Solution (Visualize / Alert / Report).
 
 ## Mail Clients
 
-* [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
-* [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
-* [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
+  * [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
+  * [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
+  * [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
 
 
 ## Mail servers/webmail
@@ -347,34 +348,36 @@ See https://github.com/kickball/awesome-selfhosted#email
 ## Monitoring
 *Monitoring software.*
 
-* [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki))
-* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
-* [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
-* [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
-* [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.
-* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
-* [Icinga](https://www.icinga.org/) - Fork of Nagios.
-* [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
-* [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
-* [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
-* [Linux Dash](https://github.com/afaqurk/linux-dash) - A simple, low-overhead web dashboard for GNU / Linux. (~1MB) ([Demo](http://linuxdash.afaqtariq.com/))
-* [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
-* [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
-* [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
-* [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
-* [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
-* [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
-* [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
-* [Sensu](http://sensuapp.org/) - Monitoring framework.
-* [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
-* [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
-* [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
-* [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
-* [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
-* [Zabbix](http://www.zabbix.com/) - Enterprise-class software for monitoring of networks and applications.
-* [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.
+  * [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki))
+  * [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
+  * [Bosun](http://bosun.org/) - Monitoring and alerting system by Stack Exchange ([Source Code](https://github.com/bosun-monitor/bosun), [Documentation](http://bosun.org/quickstart.html)) `MIT` `Go`
+  * [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`
+  * [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.
+  * [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
+  * [Icinga](https://www.icinga.org/) - Nagios fork that has since lapped nagios several times. Comes with the possibility of clustered monitoring - ([Source Code](https://github.com/Icinga)) - `GPLv2`
+  * [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
+  * [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
+  * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
+  * [Linux Dash](https://github.com/afaqurk/linux-dash) - A simple, low-overhead web dashboard for GNU / Linux. (~1MB) ([Demo](http://linuxdash.afaqtariq.com/))
+  * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
+  * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
+  * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
+  * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
+  * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
+  * [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
+  * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
+  * [Sensu](http://sensuapp.org/) - Monitoring framework.
+  * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
+  * [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
+  * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
+  * [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
+  * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
+  * [Zabbix](http://www.zabbix.com/) - Enterprise-class software for monitoring of networks and applications.
+  * [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.
 
 ## Metric & Metric Collection
 *Metric gathering and display software.*
@@ -407,19 +410,19 @@ See https://github.com/kickball/awesome-selfhosted#email
 ## Network Configuration Management
 *Network configuration management tools.*
 
-* [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
-* [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interface and GIT storage.
-* [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configuration and maintain history of changes.
-* [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
-* [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
+  * [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
+  * [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interface and GIT storage.
+  * [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configuration and maintain history of changes.
+  * [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
+  * [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
 
 ## Newsletters
 *Newsletter software.*
 
-* [DadaMail](http://dadamailproject.com/) - Mailing List Manager, written in Perl.
-* [phpList](http://www.phplist.com/) - Newsletter manager written in PHP.
-* [LibreMailer](https://github.com/averna-syd/LibreMailer) - Libre Mailer is a modest and simple web based email marketing application.
-* [Lewsnetter](https://github.com/bborn/lewsnetter) - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
+  * [DadaMail](http://dadamailproject.com/) - Mailing List Manager, written in Perl.
+  * [phpList](http://www.phplist.com/) - Newsletter manager written in PHP.
+  * [LibreMailer](https://github.com/averna-syd/LibreMailer) - Libre Mailer is a modest and simple web based email marketing application.
+  * [Lewsnetter](https://github.com/bborn/lewsnetter) - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
 
 ## NoSQL
 *NoSQL databases.*
@@ -446,184 +449,184 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Packaging
 
-* [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
-* [omnibus-ruby](https://github.com/opscode/omnibus-ruby) - Full stack, cross distro packaging software (Ruby).
-* [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
-* [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
+  * [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
+  * [omnibus-ruby](https://github.com/opscode/omnibus-ruby) - Full stack, cross distro packaging software (Ruby).
+  * [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
+  * [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
 
 ## Project Management
 *Web-based project management and bug tracking systems*: see https://github.com/Kickball/awesome-selfhosted#project-management
 
 ## Queuing
 
-* [ActiveMQ](https://activemq.apache.org/) - Java message broker.
-* [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
-* [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
-* [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
-* [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
-* [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
-* [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
+  * [ActiveMQ](https://activemq.apache.org/) - Java message broker.
+  * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
+  * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
+  * [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
+  * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
+  * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
+  * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
 
 ## RDBMS
 *Relational DBMS.*
 
-* [Firebird](http://www.firebirdsql.org/) - True universal database.
-* [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
-* [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
-  * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
-* [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
-* [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
-* [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
-* [SQLite](http://sqlite.org/) - Library that implements a self-contained, serverless, zero-configuration, transactional SQL DBS.
+  * [Firebird](http://www.firebirdsql.org/) - True universal database.
+  * [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
+  * [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
+    * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
+  * [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
+  * [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
+  * [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
+  * [SQLite](http://sqlite.org/) - Library that implements a self-contained, serverless, zero-configuration, transactional SQL DBS.
 
 ## Security
 *Security tools.*
 
-* [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
-* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
-* [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
-* [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
-* [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
-* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
-* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
-* [Linux Malware Detect](https://www.rfxn.com/projects/linux-malware-detect/) - A malware scanner for Linux designed around the threats faced in shared hosted environments.
-* [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
-* [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
-* [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
-* [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
-* [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
-* [Nmap](https://nmap.org) - Nmap is a free and open source utility for network discovery and security auditing. 
+  * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
+  * [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
+  * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
+  * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+  * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
+  * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
+  * [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
+  * [Linux Malware Detect](https://www.rfxn.com/projects/linux-malware-detect/) - A malware scanner for Linux designed around the threats faced in shared hosted environments.
+  * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
+  * [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
+  * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
+  * [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
+  * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
+  * [Nmap](https://nmap.org) - Nmap is a free and open source utility for network discovery and security auditing. 
 
 ## Service Discovery
 
-* [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
-* [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
-* [etcd](https://github.com/coreos/etcd) - distributed K/V-Store, authenticating via SSL PKI and a REST HTTP Api for shared configuration and service discovery.
-* [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
+  * [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
+  * [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
+  * [etcd](https://github.com/coreos/etcd) - distributed K/V-Store, authenticating via SSL PKI and a REST HTTP Api for shared configuration and service discovery.
+  * [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
-## Software Containers
-*Operating system–level virtualization.*
+  ## Software Containers
+  *Operating system–level virtualization.*
 
-* [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) - Userspace interface for the Linux kernel containment features.
-* [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
+  * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
+  * [LXC](https://linuxcontainers.org/lxc/) - Userspace interface for the Linux kernel containment features.
+  * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
 *SSH tools.*
 
-* [Advanced SSH config](https://pypi.python.org/pypi/advanced-ssh-config/) - Enhances ssh_config file capabilities, completely transparent.
-* [autossh](http://www.harding.motd.ca/autossh/) - Automatically respawn ssh session after network interruption.
-* [Cluster SSH](http://sourceforge.net/projects/clusterssh/) - Controls a number of xterm windows via a single graphical console.
-* [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
-* [Mosh](http://mosh.mit.edu/) - The mobile shell.
-* [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
-* [ssh-cert-authority](https://github.com/cloudtools/ssh-cert-authority) - A democratic SSH certificate authority.
-* [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
-* [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
-* [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
-* [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
+  * [Advanced SSH config](https://pypi.python.org/pypi/advanced-ssh-config/) - Enhances ssh_config file capabilities, completely transparent.
+  * [autossh](http://www.harding.motd.ca/autossh/) - Automatically respawn ssh session after network interruption.
+  * [Cluster SSH](http://sourceforge.net/projects/clusterssh/) - Controls a number of xterm windows via a single graphical console.
+  * [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
+  * [Mosh](http://mosh.mit.edu/) - The mobile shell.
+  * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
+  * [ssh-cert-authority](https://github.com/cloudtools/ssh-cert-authority) - A democratic SSH certificate authority.
+  * [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
+  * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
+  * [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
+  * [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
 
 ## Statistics
 *Analytics software.*
 
-* [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
-* [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
-* [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
-* [Piwik](http://piwik.org/) - Web analytics application.
-* [Webalizer](http://www.webalizer.org/) - Fast web server log file analysis.
+  * [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
+  * [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
+  * [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
+  * [Piwik](http://piwik.org/) - Web analytics application.
+  * [Webalizer](http://www.webalizer.org/) - Fast web server log file analysis.
 
 ## Status Pages
 
-* [Cachet](https://cachethq.io) - Status page system written in PHP.
-* [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
-* [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
-* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
+  * [Cachet](https://cachethq.io) - Status page system written in PHP.
+  * [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
+  * [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
+  * [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
 
 ## Ticketing systems
 *Web-based ticketing system.*
 
-* [Bugzilla](http://www.bugzilla.org/) - General-purpose bugtracker and testing tool originally developed and used by the Mozilla project.
-* [Cerb](http://www.cerberusweb.com/) - Group-based e-mail management project.
-* [Flyspray](http://flyspray.org) - Web-based bug tracking system written in PHP.
-* [MantisBT](http://www.mantisbt.org/) - Web-based bug tracking system.
-* [osTicket](http://osticket.com/) - Simple support ticket system.
-* [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications.
-* [Request Tracker](http://www.bestpractical.com/rt/) - Ticket-tracking system written in Perl.
-* [TheBugGenie](http://www.thebuggenie.com) - Ticket system with extensive user rights system.
+  * [Bugzilla](http://www.bugzilla.org/) - General-purpose bugtracker and testing tool originally developed and used by the Mozilla project.
+  * [Cerb](http://www.cerberusweb.com/) - Group-based e-mail management project.
+  * [Flyspray](http://flyspray.org) - Web-based bug tracking system written in PHP.
+  * [MantisBT](http://www.mantisbt.org/) - Web-based bug tracking system.
+  * [osTicket](http://osticket.com/) - Simple support ticket system.
+  * [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications.
+  * [Request Tracker](http://www.bestpractical.com/rt/) - Ticket-tracking system written in Perl.
+  * [TheBugGenie](http://www.thebuggenie.com) - Ticket system with extensive user rights system.
 
 ## Troubleshooting
 *Troubleshooting Tools.*
 
-+ [grml](https://grml.org) – bootable Debian Live CD with powerful CLI tools.
-* [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
-* [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
-* [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
+  + [grml](https://grml.org) – bootable Debian Live CD with powerful CLI tools.
+  * [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
+  * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
+  * [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
 
 ## Version control
 *Software versioning and revision control.*
 
-* [Fossil](http://www.fossil-scm.org/) - Distributed version control with built-in wiki and bug tracking.
-* [Git](http://git-scm.com/) - Distributed revision control and source code management (SCM) with an emphasis on speed.
-* [GNU Bazaar](http://bazaar.canonical.com/) - Distributed revision control system sponsored by Canonical.
-* [Mercurial](http://mercurial.selenic.com/) - Another distributed revision control.
-* [Subversion](http://subversion.apache.org/) - Client-server revision control system.
+  * [Fossil](http://www.fossil-scm.org/) - Distributed version control with built-in wiki and bug tracking.
+  * [Git](http://git-scm.com/) - Distributed revision control and source code management (SCM) with an emphasis on speed.
+  * [GNU Bazaar](http://bazaar.canonical.com/) - Distributed revision control system sponsored by Canonical.
+  * [Mercurial](http://mercurial.selenic.com/) - Another distributed revision control.
+  * [Subversion](http://subversion.apache.org/) - Client-server revision control system.
 
 ## Virtualization
 *Virtualization software.*
 
-* [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
-* [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your KVM or Xen virtualized environment.
-* [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
-* [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
-* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
-* [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems.
-* [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
-* [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
-* [QEMU](http://www.qemu.org/) - QEMU is a generic machine emulator and virtualizer.
-* [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
-* [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
-* [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
+  * [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
+  * [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your KVM or Xen virtualized environment.
+  * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
+  * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
+  * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
+  * [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems.
+  * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
+  * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
+  * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
+  * [QEMU](http://www.qemu.org/) - QEMU is a generic machine emulator and virtualizer.
+  * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
+  * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
+  * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
 
 ## VPN
 *VPN software.*
 
-* [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange.
-* [Pritunl](http://pritunl.com/) - OpenVPN based solution. Easy to set up.
-* [SoftEther](https://www.softether.org/) - Multi-protocol software VPN with advanced features
-* [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
-* [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
-* [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
+  * [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange.
+  * [Pritunl](http://pritunl.com/) - OpenVPN based solution. Easy to set up.
+  * [SoftEther](https://www.softether.org/) - Multi-protocol software VPN with advanced features
+  * [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
+  * [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
+  * [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
 
 ## XMPP
 *XMPP servers.*
 
-* [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server written in Erlang/OTP.
-* [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM.
-* [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
-* [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server.
-* [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
-* [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
+  * [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server written in Erlang/OTP.
+  * [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM.
+  * [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
+  * [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server.
+  * [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
+  * [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
 
 *XMPP Web Clients*
 
-* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
-* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives.
-* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
+  * [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
+  * [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives.
+  * [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
 
 ## Web
 *Web servers.*
 
-* [Apache](http://httpd.apache.org/) - Most popular web server.
-* [Cherokee](http://cherokee-project.com/) - Lightweight, high-performance web server/reverse proxy.
-* [Lighttpd](http://www.lighttpd.net/) - Web server more optimized for speed-critical environments.
-* [Nginx](http://nginx.org/) - Reverse proxy, load balancer, HTTP cache, and web server.
-* [uWSGI](https://github.com/unbit/uwsgi/) - The uWSGI project aims at developing a full stack for building hosting services.
+  * [Apache](http://httpd.apache.org/) - Most popular web server.
+  * [Cherokee](http://cherokee-project.com/) - Lightweight, high-performance web server/reverse proxy.
+  * [Lighttpd](http://www.lighttpd.net/) - Web server more optimized for speed-critical environments.
+  * [Nginx](http://nginx.org/) - Reverse proxy, load balancer, HTTP cache, and web server.
+  * [uWSGI](https://github.com/unbit/uwsgi/) - The uWSGI project aims at developing a full stack for building hosting services.
 
 *Web Performance*
 
-* [HAProxy](http://www.haproxy.org/) - Software based load Balancing, SSL offloading and performance optimization, compression, and general web routing.
-* [Varnish](https://www.varnish-cache.org/) - HTTP based web application accelerator focusing on optimizing caching and compression.
+  * [HAProxy](http://www.haproxy.org/) - Software based load Balancing, SSL offloading and performance optimization, compression, and general web routing.
+  * [Varnish](https://www.varnish-cache.org/) - HTTP based web application accelerator focusing on optimizing caching and compression.
 
 
 ## Wiki Software
@@ -635,61 +638,61 @@ Various resources, such as books, websites and articles, for improving your skil
 
 ## Blogs
 
-* [Code as Craft](http://codeascraft.com/) - Etsy's Ops blog, lots of technical posts.
-* [DevOpsGuys](http://blog.devopsguys.com/) - Devops consultants who blog about operations.
-* [Rackspace Developers](http://developer.rackspace.com/blog/) - Slightly biased blog with lots of Devops Topics.
+  * [Code as Craft](http://codeascraft.com/) - Etsy's Ops blog, lots of technical posts.
+  * [DevOpsGuys](http://blog.devopsguys.com/) - Devops consultants who blog about operations.
+  * [Rackspace Developers](http://developer.rackspace.com/blog/) - Slightly biased blog with lots of Devops Topics.
 
 ## Books
 *Sysadmin related books.*
 
-* [The Linux Command Line](http://linuxcommand.org/tlcl.php) - A book about the Linux command line by William Shotts.
-* [The Phoenix Project: A Novel about IT, DevOps, and Helping Your Business Win](http://itrevolution.com/books/phoenix-project-devops-book/) - How DevOps techniques can fix the problems that happen in IT organizations.
-* [The Practice of System and Network Administration](http://everythingsysadmin.com/books.html) - The first and second editions describes the best practices of system and network administration, independent of specific platforms or technologies.
-* [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
-* [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
+  * [The Linux Command Line](http://linuxcommand.org/tlcl.php) - A book about the Linux command line by William Shotts.
+  * [The Phoenix Project: A Novel about IT, DevOps, and Helping Your Business Win](http://itrevolution.com/books/phoenix-project-devops-book/) - How DevOps techniques can fix the problems that happen in IT organizations.
+  * [The Practice of System and Network Administration](http://everythingsysadmin.com/books.html) - The first and second editions describes the best practices of system and network administration, independent of specific platforms or technologies.
+  * [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
+  * [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
 
 ## Communities / Forums
 *For the social people.*
 
-* [ArsTechnica OpenForum](http://arstechnica.com/civis/) – IT Forum which is attached to a large news site.
-* [Reddit](https://www.reddit.com) - Really, really large bulletin board system.
-  * [/r/Linux](https://www.reddit.com/r/linux) - News and information about Linux.
-  * [/r/LinuxQuestions](https://www.reddit.com/r/linuxquestions)
-  * [/r/SysAdmin](https://www.reddit.com/r/sysadmin/)
-* [Spiceworks Community](https://community.spiceworks.com/start) – General enterprise IT news and small articles.
-* [StackExchange Network](https://stackexchange.com/sites#technology) – Q&A communities.
-  * [Server Fault](https://serverfault.com/) – StackExchange community for system and network administrators.
+  * [ArsTechnica OpenForum](http://arstechnica.com/civis/) – IT Forum which is attached to a large news site.
+  * [Reddit](https://www.reddit.com) - Really, really large bulletin board system.
+    * [/r/Linux](https://www.reddit.com/r/linux) - News and information about Linux.
+    * [/r/LinuxQuestions](https://www.reddit.com/r/linuxquestions)
+    * [/r/SysAdmin](https://www.reddit.com/r/sysadmin/)
+  * [Spiceworks Community](https://community.spiceworks.com/start) – General enterprise IT news and small articles.
+  * [StackExchange Network](https://stackexchange.com/sites#technology) – Q&A communities.
+    * [Server Fault](https://serverfault.com/) – StackExchange community for system and network administrators.
 
 ## Newsletters
 
-* [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
-* [Web Operations Weekly](http://webopsweekly.com/) - A weekly newsletter on Web operations, infrastructure, performance, and tooling, from the browser down to the metal.
+  * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
+  * [Web Operations Weekly](http://webopsweekly.com/) - A weekly newsletter on Web operations, infrastructure, performance, and tooling, from the browser down to the metal.
 
 ## Repositories
 *Software package repositories.*
 
-* [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
+  * [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
 
 ### Debian-based distributions
-* [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
+  * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
 
 ### RPM-based distributions
-* [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
-* [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
-* [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
-* [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
+  * [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
+  * [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
+  * [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
+  * [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
 
 ## Websites
 *Useful sysadmin related websites.*
 
-* [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
-* [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
+  * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
+  * [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
 
 ## Wikis
 *Useful Wikis for Sysadmins – not to be confused with Wiki software.*
 
-* [ArchWiki](https://wiki.archlinux.org/) – Arch Linux Wiki which has really nice written articles valid for other distros.
-* [Gentoo Wiki](https://wiki.gentoo.org/) - Gentoo Linux Wiki with a lot in-detail description of Linux components.
+  * [ArchWiki](https://wiki.archlinux.org/) – Arch Linux Wiki which has really nice written articles valid for other distros.
+  * [Gentoo Wiki](https://wiki.gentoo.org/) - Gentoo Linux Wiki with a lot in-detail description of Linux components.
 
 ## License
 
-- 
GitLab


From 66acf5553d558809115e7b372c44e8200751ab8e Mon Sep 17 00:00:00 2001
From: phre4k <me@phre4k.at>
Date: Wed, 2 Sep 2015 13:53:02 +0200
Subject: [PATCH 190/193] add Bosun, cadvisor, Kubernetes; Icinga description.
 fixes #105 Remove some unneccessary spaces, instead add indentation. harr
 harr, now this repo is incompatible with kahun's.

---
 README.md | 723 +++++++++++++++++++++++++++---------------------------
 1 file changed, 363 insertions(+), 360 deletions(-)

diff --git a/README.md b/README.md
index 722b326..91b9f43 100644
--- a/README.md
+++ b/README.md
@@ -70,274 +70,275 @@
 ## Automation
 *Automation build.*
 
-* [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
-* [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
-* [Bazel](http://bazel.io/) - Google's build system.
-* [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
-* [Gradle](http://gradle.org/) - Another build automation system.
-* [Rake](https://github.com/ruby/rake) - Build automation tool similar to Make, written in and extensible in Ruby.
+  * [Apache Ant](https://ant.apache.org/) - Automation build tool, similar to make, written in Java.
+  * [Apache Maven](http://maven.apache.org/) - Build automation tool mainly for Java.
+  * [Bazel](http://bazel.io/) - Google's build system.
+  * [GNU Make](http://www.gnu.org/software/make/) - The most popular automation build tool for many purposes.
+  * [Gradle](http://gradle.org/) - Another build automation system.
+  * [Rake](https://github.com/ruby/rake) - Build automation tool similar to Make, written in and extensible in Ruby.
 
 ## Backups
 *Backup software.*
 
-* [Amanda](http://www.amanda.org/) - Client-server model backup tool.
-* [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
-* [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
-* [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
-* [Brebis](http://brebisproject.org) - A fully automated backup checker
-* [Burp](http://burp.grke.org/) - Network backup and restore program.
-* [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
-* [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
-* [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
-* [Obnam](http://obnam.org/) - An easy, secure, snapshots-based backup program with data de-duplication.
-* [Rdiff-backup](http://www.nongnu.org/rdiff-backup/) - An easy A remote incremental backup of all your files.
-* [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
-* [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
-* [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
-* [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
-* [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
+  * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
+  * [Attic](https://attic-backup.org) - A deduplicating backup program written in Python.
+  * [Bareos](http://www.bareos.org) - A fork of Bacula backup tool.
+  * [Backupninja](https://labs.riseup.net/code/projects/backupninja) - Lightweight, extensible meta-backup system.
+  * [Brebis](http://brebisproject.org) - A fully automated backup checker
+  * [Burp](http://burp.grke.org/) - Network backup and restore program.
+  * [Duplicity](http://duplicity.nongnu.org/) - Encrypted bandwidth-efficient backup using the rsync algorithm.
+  * [Elkarbackup](https://github.com/elkarbackup/elkarbackup) - Backup solution based on RSnapshot with a simple web interface
+  * [Lsyncd](https://github.com/axkibe/lsyncd) - File Monitor which spawns a process to synchronize the changes (rsync by default).
+  * [Obnam](http://obnam.org/) - An easy, secure, snapshots-based backup program with data de-duplication.
+  * [Rdiff-backup](http://www.nongnu.org/rdiff-backup/) - An easy A remote incremental backup of all your files.
+  * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
+  * [Snebu](http://www.snebu.com/) – Snapshot backup with global multi-client deduplication and transparent compression.
+  * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.
+  * [DREBS](https://github.com/dojo4/drebs) - AWS EBS backup script that supports strategies.
+  * [ZBackup](http://zbackup.org/) - A versatile deduplicating backup tool.
 
 ## Build and software organization tools
 *Build and software organization tools.*
 
-* [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
-* [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
-* [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
+  * [EasyBuild](https://easybuild.readthedocs.org/en/latest/) - EasyBuild builds software and modulefiles for High Performance Computing (HPC) systems in an efficient way.
+  * [environment-modules Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod) - Lmod is a Lua based module system that easily handles the MODULEPATH Hierarchical problem.
+  * [HPCBIOS](hpcbios.readthedocs.org/en/latest/) - HPCBIOS is an effort to setup a common, well-documented and reproducible, environment spanning across multiple HPC systems & sites, *inclusive* of documentation.
 
 ## ChatOps
 *Conversation-driven development and management. See http://www.reddit.com/r/chatops for more information.*
 
-* [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable Python IRC bot.
-* [Eggdrop](http://www.eggheads.org/) - the world's most popular IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
-* [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
-* [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
-* [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
-* [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
+  * [CloudBot](https://github.com/CloudBotIRC/CloudBot) - The simple, fast, expandable Python IRC bot.
+  * [Eggdrop](http://www.eggheads.org/) - the world's most popular IRC bot, designed for flexibility and ease of use, and is freely distributable under the GNU GPL.
+  * [Err](http://errbot.net/) - a plugin based chatbot designed to be easily deployable, extensible and maintainable.
+  * [Hubot](https://hubot.github.com/) - A customizable, life embetterment robot.
+  * [Lazlo](https://github.com/djosephsen/lazlo) - A chatops automation framework in Go.
+  * [Lita](https://www.lita.io/) - A robot companion for your company's chat room.
 
 ## Client management
 *Managing software on desktop computers.*
 
-* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
-* [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
-* [WAPT](http://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.
+  * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Inventory, deployment and network scan.
+  * [Opsi](http://www.opsi.org/en) (open PC server integration) - Client Management for Windows based on Debian.
+  * [WAPT](http://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.
 
 ## Cloning
 *Cloning software.*
 
-* [Clonezilla](http://clonezilla.org/) - Partition and disk imaging/cloning program.
-* [Fog](http://www.fogproject.org/) - Another computer cloning solution.
+  * [Clonezilla](http://clonezilla.org/) - Partition and disk imaging/cloning program.
+  * [Fog](http://www.fogproject.org/) - Another computer cloning solution.
 
 ## Cloud Computing
 
-* [AppScale](http:/github.com/AppScale/appscale) - Cloud software with Google App Engine compatibility.
-* [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
-* [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
-* [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
-* [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
-* [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
-* [Flynn](https://flynn.io) - PaaS
-* [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
-* [OpenNebula](http://opennebula.org/) - User-driven cloud management platform for sysadmins and devops.
-* [Openshift](http://www.openshift.org) - PaaS product from Red Hat.
-* [OpenStack](https://www.openstack.org/) - Build private and public clouds.
-* [The Foreman](http://theforeman.org/) - Complete lifecycle management tool for physical and virtual servers. FOSS.
-* [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
+  * [AppScale](http:/github.com/AppScale/appscale) - Cloud software with Google App Engine compatibility.
+  * [Archipel](http://archipelproject.org/) - Manage and supervise virtual machines using Libvirt.
+  * [CloudStack](http://cloudstack.apache.org/) - Cloud computing software for creating, managing, and deploying infrastructure cloud services.
+  * [Cobbler](http://www.cobblerd.org/) - Cobbler is a Linux installation server that allows for rapid setup of network installation environments.
+  * [Cracow Cloud One - Polish Private Cloud](http://cc1.ifj.edu.pl/) - The CC1 system provides a complete solution for Private Cloud Computing.
+  * [Eucalyptus](https://www.eucalyptus.com/) - Private cloud software with AWS compatibility.
+  * [Flynn](https://flynn.io) - PaaS
+  * [Mesos](http://mesos.apache.org/) - Develop and run resource-efficient distributed systems.
+  * [OpenNebula](http://opennebula.org/) - User-driven cloud management platform for sysadmins and devops.
+  * [Openshift](http://www.openshift.org) - PaaS product from Red Hat.
+  * [OpenStack](https://www.openstack.org/) - Build private and public clouds.
+  * [The Foreman](http://theforeman.org/) - Complete lifecycle management tool for physical and virtual servers. FOSS.
+  * [Tsuru](https://tsuru.io) - Tsuru is an extensible Platform as a Service software.
 
 ## Cloud Orchestration
 
-* [BOSH](http://docs.cloudfoundry.org/bosh/) -  IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
-* [Cloudify](http://www.getcloudify.org/) -  TOSCA-based cloud orchestration software platform written in Python and YAML.
-* [CloudSlang](http://www.cloudslang.io/) -  Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
-* [Juju](https://juju.ubuntu.com/) - Cloud orchestration tool which manages services as charms, YAML configuration and deployment script bundles.
-* [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
-* [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://www.saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
-* [StackStorm](http://stackstorm.com/) - Event Driven Operations and ChatOps platform for infrastructure management. Written in Python
+  * [BOSH](http://docs.cloudfoundry.org/bosh/) - IaaS orchestration platform originally written for deploying and managing Cloud Foundry PaaS, but also useful for general purpose distributed systems.
+  * [Cloudify](http://www.getcloudify.org/) - TOSCA-based cloud orchestration software platform written in Python and YAML.
+  * [CloudSlang](http://www.cloudslang.io/) - Flow-based orchestration tool for managing deployed applications, with Docker capabilities.
+  * [Juju](https://juju.ubuntu.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/v1.0/)) `Apache` `Go`
+  * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs.
+  * [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://www.saltstack.com/) - Fast, scalable and flexible systems management software written in Python/ZeroMQ.
+  * [StackStorm](http://stackstorm.com/) - Event Driven Operations and ChatOps platform for infrastructure management. Written in Python
 
 ## Cloud Storage
 
-* [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
-* [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
-* [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature solution for file sharing and synchronization.
-* [Seafile](http://seafile.com) - Another Cloud Storage solution.
-* [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
-* [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
-* [Syncthing](http://syncthing.net/) - System for private, encrypted and authenticated distribution of data.
+  * [git-annex assistant](http://git-annex.branchable.com/assistant/) - A synchronised folder on each of your OSX and Linux computers, Android devices, removable drives, NAS appliances, and cloud services.
+  * [ownCloud](https://owncloud.org) - Provides universal access to your files via the web, your computer or your mobile devices.
+  * [Pydio](https://pyd.io) - Pydio (formerly AjaXplorer) is a mature solution for file sharing and synchronization.
+  * [Seafile](http://seafile.com) - Another Cloud Storage solution.
+  * [SparkleShare](http://sparkleshare.org/) - Provides cloud storage and file synchronization services. By default, it uses Git as a storage backend.
+  * [Swift](http://docs.openstack.org/developer/swift/) - A highly available, distributed, eventually consistent object/blob store.
+  * [Syncthing](http://syncthing.net/) - System for private, encrypted and authenticated distribution of data.
 
 ## Code Review
 *Web Based collaborative code review system.*
 
-* [Gerrit](https://www.gerritcodereview.com/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
-* [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
-* [Review Board](https://www.reviewboard.org/) - Available as free software under the MIT License.
+  * [Gerrit](https://www.gerritcodereview.com/) - Based on the Git version control, it facilitates software developers to review modifications to the source code and approve or reject those changes.
+  * [Phabricator](http://phabricator.org/) - Code review tool build by facebook and used by WikiMedia, FB, dropbox etc. Comes with an integrated wiki, bug tracker, VC integration and a CLI tool called arcanist.
+  * [Review Board](https://www.reviewboard.org/) - Available as free software under the MIT License.
 
 ## Collaborative Software
 *Collaborative software or groupware suites.*
 
-* [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs.
-* [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP.
-* [Horde Groupware](http://www.horde.org/apps/groupware) - PHP based collaborative software suite that includes email, calendars, wikis, time tracking and file management.
-* [Kolab](https://www.kolab.org) - Another groupware suite.
-* [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability.
-* [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client.
+  * [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs.
+  * [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP.
+  * [Horde Groupware](http://www.horde.org/apps/groupware) - PHP based collaborative software suite that includes email, calendars, wikis, time tracking and file management.
+  * [Kolab](https://www.kolab.org) - Another groupware suite.
+  * [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability.
+  * [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client.
 
 ## Configuration Management Database
 *Configuration management database (CMDB) software.*
 
-* [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
-* [iTop](http://www.combodo.com/-Overview-.html) - 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.
+  * [i-doit](http://www.i-doit.org/) - IT Documentation and CMDB.
+  * [iTop](http://www.combodo.com/-Overview-.html) - 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.
 
 ## Configuration Management
 *Configuration management tools.*
 
-* [Ansible](http://www.ansibleworks.com/) -  It's written in Python and manages the nodes over SSH.
-* [CFEngine](http://cfengine.com/) - Lightweight agent system. Configuration state is specified via a declarative language.
-* [Chef](http://www.opscode.com/chef/) - It's written in Ruby and Erlang and uses a pure-Ruby DSL.
-* [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL.
-* [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL.
-* [Salt](http://www.saltstack.com/) - It's written in Python.
-* [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
+  * [Ansible](http://www.ansibleworks.com/) -  It's written in Python and manages the nodes over SSH.
+  * [CFEngine](http://cfengine.com/) - Lightweight agent system. Configuration state is specified via a declarative language.
+  * [Chef](http://www.opscode.com/chef/) - It's written in Ruby and Erlang and uses a pure-Ruby DSL.
+  * [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL.
+  * [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL.
+  * [Salt](http://www.saltstack.com/) - It's written in Python.
+  * [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl.
 
 ## Continuous Integration & Continuous Deployment
 *Continuous integration/deployment software.*
 
-* [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
-* [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
-* [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
-* [Go](http://www.go.cd/) - Continuous delivery server.
-* [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
+  * [Buildbot](http://buildbot.net/) - Python-based toolkit for continuous integration.
+  * [Drone](https://github.com/drone/drone) - Continuous integration server built on Docker and configured using YAML files.
+  * [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories.
+  * [Go](http://www.go.cd/) - Continuous delivery server.
+  * [Jenkins](http://jenkins-ci.org/) - An extendable continuous integration server.
 
 ## Control Panels
 *Web hosting and server or service control panels*
 
-* Web hosting
-  * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
-  * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
-  * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
-  * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
-* DNS
-  * [Atomia DNS](http://atomiadns.com/) - DNS management system.
-  * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
-  * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
-* Revision Control
-  * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
-  * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
-  * [WebSVN](http://www.websvn.info/) - Opensource web subversion repository browser.
-* Virtualization
-  * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
-  * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
-  * [OpenVZ Web Panel](http://owp.softunity.com.ru/) - Web panel to control your OpenVZ servers.
-  * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
-  * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
-* Server
-  * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
-  * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
-  * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
-  * [Webmin](http://www.webmin.com/) - Linux server control panel.
-* Others
+  * Web hosting
+    * [Froxlor](http://www.froxlor.org/) - Easy to use panel for Linux with Nginx and PHP-FPM support.
+    * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux.
+    * [Sentora](http://sentora.org/) - Control panel for Linux, BSD, and Windows based on ZPanel.
+    * [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx.
+  * DNS
+    * [Atomia DNS](http://atomiadns.com/) - DNS management system.
+    * [PDNS Gui](https://github.com/odoucet/pdns-gui) - WebGUI which aids in administering domains and records for PowerDNS with MySQL.
+    * [Poweradmin](http://www.poweradmin.org/) - Friendly web-based DNS administration tool for PowerDNS server.
+  * Revision Control
+    * [iF.SVNAdmin](http://svnadmin.insanefactory.com/) - WebGUI to manage Subversion repositories and User/Group permissions.
+    * [SCM-Manager](https://www.scm-manager.org/) - The easiest way to share and manage your Git, Mercurial and Subversion repositories.
+    * [WebSVN](http://www.websvn.info/) - Opensource web subversion repository browser.
+  * Virtualization
+    * [Feathur](http://feathur.com) - VPS Provisioning and Management Software.
+    * [Panamax](http://panamax.io/) - Project that makes deploying complex containerized apps as easy as Drag-and-Drop.
+    * [OpenVZ Web Panel](http://owp.softunity.com.ru/) - Web panel to control your OpenVZ servers.
+    * [Virtkick](https://www.virtkick.com/) - A simple orchestrator. Manage virtual machines or Docker containers easily.
+    * [WebVirtMgr](https://retspen.github.io) - libvirt-based Web interface for managing virtual machines.
+  * Server
+    * [Ajenti](http://ajenti.org/) - Control panel for Linux and BSD.
+    * [Cockpit](http://cockpit-project.org/) - New multi-server web interface for Linux servers written in C.
+    * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin.
+    * [Webmin](http://www.webmin.com/) - Linux server control panel.
+  * Others
 
 ## Deployment Automation
 *Tools and scripts to support deployments to your servers.*
 
-* [Capistrano](http://www.capistranorb.com) - Deploy your application to any number of machines simultaneously, in sequence or as a rolling set via SSH (rake based).
-* [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
-* [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (rake based).
-* [Rocketeer](http://rocketeer.autopergamene.eu/) - PHP task runner and deployment tool.
-* [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation (rake based).
+  * [Capistrano](http://www.capistranorb.com) - Deploy your application to any number of machines simultaneously, in sequence or as a rolling set via SSH (rake based).
+  * [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks.
+  * [Mina](http://nadarei.co/mina/) - Really fast deployer and server automation tool (rake based).
+  * [Rocketeer](http://rocketeer.autopergamene.eu/) - PHP task runner and deployment tool.
+  * [Vlad the Deployer](http://rubyhitsquad.com/Vlad_the_Deployer.html) - Deployment automation (rake based).
 
 ## Distributed Filesystems
 *Network distributed filesystems.*
 
-* [Ceph](http://ceph.com/) - Distributed object store and file system.
-* [DRBD](http://www.drbd.org/) - Distributed Replicated Block Device.
-* [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
-* [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
-* [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
-* [Lustre](http://lustre.opensfs.org/) - Parallel distributed file system, generally used for large-scale cluster computing.
-* [MooseFS](http://www.moosefs.org/) - Fault tolerant, network distributed file system.
-* [MogileFS](http://mogilefs.org/) - Application level, network distributed file system.
-* [OpenAFS](http://www.openafs.org/) - Distributed network file system with read-only replicas and multi-OS support.
-* [TahoeLAFS](https://tahoe-lafs.org/trac/tahoe-lafs) - secure, decentralized, fault-tolerant, peer-to-peer distributed data store and distributed file system.
-* [XtreemFS](http://www.xtreemfs.org/) - XtreemFS is a fault-tolerant distributed file system for all storage needs.
+  * [Ceph](http://ceph.com/) - Distributed object store and file system.
+  * [DRBD](http://www.drbd.org/) - Distributed Replicated Block Device.
+  * [LeoFS](http://leo-project.net) - Unstructured object/data storage and a highly available, distributed, eventually consistent storage system.
+  * [GlusterFS](http://www.gluster.org/) - Scale-out network-attached storage file system.
+  * [HDFS](http://hadoop.apache.org/) - Distributed, scalable, and portable file-system written in Java for the Hadoop framework.
+  * [Lustre](http://lustre.opensfs.org/) - Parallel distributed file system, generally used for large-scale cluster computing.
+  * [MooseFS](http://www.moosefs.org/) - Fault tolerant, network distributed file system.
+  * [MogileFS](http://mogilefs.org/) - Application level, network distributed file system.
+  * [OpenAFS](http://www.openafs.org/) - Distributed network file system with read-only replicas and multi-OS support.
+  * [TahoeLAFS](https://tahoe-lafs.org/trac/tahoe-lafs) - secure, decentralized, fault-tolerant, peer-to-peer distributed data store and distributed file system.
+  * [XtreemFS](http://www.xtreemfs.org/) - XtreemFS is a fault-tolerant distributed file system for all storage needs.
 
 ## DNS
 *DNS servers.*
 
-* [Bind](https://www.isc.org/downloads/bind/) - The most widely used name server software.
-* [djbdns](http://cr.yp.to/djbdns.html) - A collection of DNS applications, including tinydns.
-* [Designate](https://wiki.openstack.org/wiki/Designate) - DNS REST API that support several DNS servers as its backend.
-* [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) - A lightweight service providing DNS, DHCP and TFTP services to small-scale networks.
-* [Knot](https://www.knot-dns.cz/) - High performance authoritative-only DNS server.
-* [NSD](http://www.nlnetlabs.nl/projects/nsd/) - Authoritative only, high performance, simple name server.
-* [PowerDNS](https://www.powerdns.com/) - DNS server with a variety of data storage back-ends and load balancing features.
-* [Unbound](http://unbound.net/) - Validating, recursive, and caching DNS resolver.
-* [Yadifa](http://yadifa.eu/) - Lightweight authoritative Name Server with DNSSEC capabilities powering the .eu top-level domain.
+  * [Bind](https://www.isc.org/downloads/bind/) - The most widely used name server software.
+  * [djbdns](http://cr.yp.to/djbdns.html) - A collection of DNS applications, including tinydns.
+  * [Designate](https://wiki.openstack.org/wiki/Designate) - DNS REST API that support several DNS servers as its backend.
+  * [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) - A lightweight service providing DNS, DHCP and TFTP services to small-scale networks.
+  * [Knot](https://www.knot-dns.cz/) - High performance authoritative-only DNS server.
+  * [NSD](http://www.nlnetlabs.nl/projects/nsd/) - Authoritative only, high performance, simple name server.
+  * [PowerDNS](https://www.powerdns.com/) - DNS server with a variety of data storage back-ends and load balancing features.
+  * [Unbound](http://unbound.net/) - Validating, recursive, and caching DNS resolver.
+  * [Yadifa](http://yadifa.eu/) - Lightweight authoritative Name Server with DNSSEC capabilities powering the .eu top-level domain.
 
 ## Editors
 *Open source code editors.*
 
-* [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://eclipse.org/) - IDE written in Java with an extensible plug-in system.
-* [Geany](http://www.geany.org/) - GTK2 text editor.
-* [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
-* [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
-* [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
-* [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://www.lighttable.com/) - The next generation code editor.
-* [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
-* [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.
-* [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
+  * [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://eclipse.org/) - IDE written in Java with an extensible plug-in system.
+  * [Geany](http://www.geany.org/) - GTK2 text editor.
+  * [GNU Emacs](http://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more.
+  * [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview.
+  * [ICEcoder](http://icecoder.net) - Code editor awesomeness, built with common web languages.
+  * [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://www.lighttable.com/) - The next generation code editor.
+  * [Lime](http://limetext.org/) - Aims to provide an open source solution to Sublime Text
+  * [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.
+  * [Nano](http://nano-editor.org) - Easy to use, customizable text editor.
 
 ## Identity Management
 *LDAP servers and other tools to manage accounts and identities.*
 
 ### LDAP
-* [389 Directory Server](http://port389.org) - Developed by Red Hat.
-* [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
-* [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
-* [OpenDS](https://opends.java.net/) - Another directory server written in Java.
-* [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
+  * [389 Directory Server](http://port389.org) - Developed by Red Hat.
+  * [Apache Directory Server](http://directory.apache.org/) - Apache Software Foundation project written in Java.
+  * [OpenDJ](http://opendj.forgerock.org/) - Fork of OpenDS.
+  * [OpenDS](https://opends.java.net/) - Another directory server written in Java.
+  * [OpenLDAP](http://openldap.org/) - Developed by the OpenLDAP Project.
 
 ### Tools and web interfaces
-* [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
-* [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
-* [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
-* [Samba](https://www.samba.org/) – Active Directory and CIFS protocol implementation.
+  * [Fusion Directory](http://www.fusiondirectory.org) - Improve the Management of the services and the company directory based on OpenLDAP.
+  * [FreeIPA](http://www.freeipa.org/) - Security management solution, can manage LDAP, KRB, DNS, sudo, and more
+  * [LDAP Account Manager (LAM)](https://www.ldap-account-manager.org/lamcms/) - Web frontend for managing entries (e.g. users, groups, DHCP settings) stored in an LDAP directory.
+  * [Samba](https://www.samba.org/) – Active Directory and CIFS protocol implementation.
 
 ## IT Asset Management
 *IT Assets Management software.*
 
-* [GLPI](http://www.glpi-project.org/spip.php?lang=en) - Information Resource-Manager with an additional Administration Interface.
-* [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Enables users to inventory their IT assets.
-* [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration.
-* [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
-* [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
+  * [GLPI](http://www.glpi-project.org/spip.php?lang=en) - Information Resource-Manager with an additional Administration Interface.
+  * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Enables users to inventory their IT assets.
+  * [RackTables](http://racktables.org/) - Datacenter and server room asset management like document hardware assets, network addresses, space in racks, networks configuration.
+  * [Ralph](https://github.com/allegro/ralph) - Asset management, DCIM and CMDB system for large Data Centers as well as smaller LAN networks.
+  * [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
 
 ## Log Management
 *Log management tools: collect, parse, visualize ...*
 
-* [Elasticsearch](http://www.elasticsearch.org/) - A Lucene Based Document store mainly used for log indexing, storage and analysis.
-* [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper.
-* [Flume](https://flume.apache.org/) - Distributed log collection and aggregation system.
-* [Graylog2](http://graylog2.org/) - Pluggable Log and Event Analysis Server with Alerting options.
-* [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
-* [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
-* [Logstash](http://logstash.net/) - Tool for managing events and logs.
-* [Octopussy](http://www.octopussy.pm) - Log Management Solution (Visualize / Alert / Report).
+  * [Elasticsearch](http://www.elasticsearch.org/) - A Lucene Based Document store mainly used for log indexing, storage and analysis.
+  * [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper.
+  * [Flume](https://flume.apache.org/) - Distributed log collection and aggregation system.
+  * [Graylog2](http://graylog2.org/) - Pluggable Log and Event Analysis Server with Alerting options.
+  * [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
+  * [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
+  * [Logstash](http://logstash.net/) - Tool for managing events and logs.
+  * [Octopussy](http://www.octopussy.pm) - Log Management Solution (Visualize / Alert / Report).
 
 ## Mail Clients
 
-* [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
-* [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
-* [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
+  * [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
+  * [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
+  * [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
 
 
 ## Mail servers/webmail
@@ -347,34 +348,36 @@ See https://github.com/kickball/awesome-selfhosted#email
 ## Monitoring
 *Monitoring software.*
 
-* [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki))
-* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
-* [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
-* [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
-* [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.
-* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
-* [Icinga](https://www.icinga.org/) - Fork of Nagios.
-* [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
-* [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
-* [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
-* [Linux Dash](https://github.com/afaqurk/linux-dash) - A simple, low-overhead web dashboard for GNU / Linux. (~1MB) ([Demo](http://linuxdash.afaqtariq.com/))
-* [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
-* [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
-* [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
-* [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
-* [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
-* [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
-* [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
-* [Sensu](http://sensuapp.org/) - Monitoring framework.
-* [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
-* [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
-* [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
-* [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
-* [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
-* [Zabbix](http://www.zabbix.com/) - Enterprise-class software for monitoring of networks and applications.
-* [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.
+  * [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki))
+  * [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
+  * [Bosun](http://bosun.org/) - Monitoring and alerting system by Stack Exchange ([Source Code](https://github.com/bosun-monitor/bosun), [Documentation](http://bosun.org/quickstart.html)) `MIT` `Go`
+  * [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`
+  * [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.
+  * [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
+  * [Icinga](https://www.icinga.org/) - Nagios fork that has since lapped nagios several times. Comes with the possibility of clustered monitoring - ([Source Code](https://github.com/Icinga)) - `GPLv2`
+  * [LibreNMS](http://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support.
+  * [Monit](http://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems.
+  * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool.
+  * [Linux Dash](https://github.com/afaqurk/linux-dash) - A simple, low-overhead web dashboard for GNU / Linux. (~1MB) ([Demo](http://linuxdash.afaqtariq.com/))
+  * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features.
+  * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application.
+  * [Node-Bell](https://github.com/eleme/node-bell) - Real-time anomalies detection for periodic time series, metrics monitor.
+  * [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux.
+  * [OMD](http://omdistro.org/) - The Open Monitoring Distribution.
+  * [PhpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - A customizable PHP script that displays information about your system nicely
+  * [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis.
+  * [Sensu](http://sensuapp.org/) - Monitoring framework.
+  * [Sentry](https://getsentry.com/) - Application monitoring, event logging and aggregation.
+  * [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
+  * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework.
+  * [Thruk](http://www.thruk.org/) - Multibackend monitoring web interface with support for Naemon, Nagios, Icinga and Shinken.
+  * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother.
+  * [Zabbix](http://www.zabbix.com/) - Enterprise-class software for monitoring of networks and applications.
+  * [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.
 
 ## Metric & Metric Collection
 *Metric gathering and display software.*
@@ -407,19 +410,19 @@ See https://github.com/kickball/awesome-selfhosted#email
 ## Network Configuration Management
 *Network configuration management tools.*
 
-* [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
-* [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interface and GIT storage.
-* [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configuration and maintain history of changes.
-* [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
-* [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
+  * [GestióIP](http://www.gestioip.net/) - An automated web based IPv4/IPv6 IP Address Management tool.
+  * [Oxidized](https://github.com/ytti/oxidized) - A modern take on network device configuration monitoring with web interface and GIT storage.
+  * [RANCID](http://www.shrubbery.net/rancid/) - Monitors network device's configuration and maintain history of changes.
+  * [rConfig](http://www.rconfig.com/) - Another network device configuration management tool.
+  * [trigger](https://github.com/trigger/trigger) - Robust network automation toolkit written in Python.
 
 ## Newsletters
 *Newsletter software.*
 
-* [DadaMail](http://dadamailproject.com/) - Mailing List Manager, written in Perl.
-* [phpList](http://www.phplist.com/) - Newsletter manager written in PHP.
-* [LibreMailer](https://github.com/averna-syd/LibreMailer) - Libre Mailer is a modest and simple web based email marketing application.
-* [Lewsnetter](https://github.com/bborn/lewsnetter) - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
+  * [DadaMail](http://dadamailproject.com/) - Mailing List Manager, written in Perl.
+  * [phpList](http://www.phplist.com/) - Newsletter manager written in PHP.
+  * [LibreMailer](https://github.com/averna-syd/LibreMailer) - Libre Mailer is a modest and simple web based email marketing application.
+  * [Lewsnetter](https://github.com/bborn/lewsnetter) - E-mail marketing application (create and send e-mail newsletter via SES). Includes subscription management, delivery, bounce and complaint notification, templates, and some stats.
 
 ## NoSQL
 *NoSQL databases.*
@@ -446,184 +449,184 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
 
 ## Packaging
 
-* [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
-* [omnibus-ruby](https://github.com/opscode/omnibus-ruby) - Full stack, cross distro packaging software (Ruby).
-* [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
-* [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
+  * [fpm](https://github.com/jordansissel/fpm) - Versatile multi format package creator.
+  * [omnibus-ruby](https://github.com/opscode/omnibus-ruby) - Full stack, cross distro packaging software (Ruby).
+  * [packman](http://packman.readthedocs.org) - Full stack, cross distro packaging software (Python).
+  * [tito](https://github.com/dgoodwin/tito) - Builds RPMs for git-based projects.
 
 ## Project Management
 *Web-based project management and bug tracking systems*: see https://github.com/Kickball/awesome-selfhosted#project-management
 
 ## Queuing
 
-* [ActiveMQ](https://activemq.apache.org/) - Java message broker.
-* [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
-* [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
-* [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
-* [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
-* [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
-* [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
+  * [ActiveMQ](https://activemq.apache.org/) - Java message broker.
+  * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
+  * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
+  * [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
+  * [NSQ](http://nsq.io/) - A realtime distributed messaging platform.
+  * [RabbitMQ](http://www.rabbitmq.com/) - Robust, fully featured, cross distro queuing system.
+  * [ZeroMQ](http://zeromq.org/) - Lightweight queuing system.
 
 ## RDBMS
 *Relational DBMS.*
 
-* [Firebird](http://www.firebirdsql.org/) - True universal database.
-* [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
-* [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
-  * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
-* [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
-* [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
-* [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
-* [SQLite](http://sqlite.org/) - Library that implements a self-contained, serverless, zero-configuration, transactional SQL DBS.
+  * [Firebird](http://www.firebirdsql.org/) - True universal database.
+  * [Galera](http://galeracluster.com/) - Galera Cluster for MySQL is an easy-to-use high-availability solution with high system up-time, no data loss, and scalability for future growth.
+  * [MariaDB](https://mariadb.org/) - Community-developed fork of the MySQL.
+    * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
+  * [Percona Server](http://www.percona.com/software) - Enhanced, drop-in MySQL replacement.
+  * [PostgreSQL](http://www.postgresql.org/) - Object-relational database management system (ORDBMS).
+  * [PostgreSQL-XL](http://www.postgres-xl.org/) - Scalable PostgreSQL-based database cluster.
+  * [SQLite](http://sqlite.org/) - Library that implements a self-contained, serverless, zero-configuration, transactional SQL DBS.
 
 ## Security
 *Security tools.*
 
-* [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
-* [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
-* [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
-* [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
-* [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
-* [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
-* [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
-* [Linux Malware Detect](https://www.rfxn.com/projects/linux-malware-detect/) - A malware scanner for Linux designed around the threats faced in shared hosted environments.
-* [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
-* [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
-* [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
-* [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
-* [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
-* [Nmap](https://nmap.org) - Nmap is a free and open source utility for network discovery and security auditing. 
+  * [Blackbox](https://github.com/StackExchange/blackbox) - Safely store secrets in Git/Mercurial. Provides tooling to automatically encrypt secrets like passwords.
+  * [Bro](http://www.bro.org) - Bro is a powerful framework for network analysis and security monitoring.
+  * [Denyhosts](http://denyhosts.sourceforge.net/) - Thwart SSH dictionary based attacks and brute force attacks.
+  * [Fail2Ban](http://www.fail2ban.org/wiki/index.php/Main_Page) - Scans log files and takes action on IPs that show malicious behavior.
+  * [fwknop](https://www.cipherdyne.org/fwknop/) - Protects ports via Single Packet Authorization in your firewall.
+  * [Glastopf](http://glastopf.org/) - A low-interaction web application honeypot to emulate vulnerabilities and gather attack data.
+  * [Kippo](https://github.com/desaster/kippo) - A medium-interaction SSH honeypot, mostly used as a standalone SSH daemon with a configurable Filesystem sandbox.
+  * [Linux Malware Detect](https://www.rfxn.com/projects/linux-malware-detect/) - A malware scanner for Linux designed around the threats faced in shared hosted environments.
+  * [OSSEC](http://ossec.net) - OSSEC is a HIDS that performs log analysis, FIM, rootkit detection, and much more.
+  * [OSQuery](https://osquery.io/) - Query your servers status and info using a SQL like interface.
+  * [pfSense](https://www.pfsense.org/) - Firewall and Router FreeBSD distribution.
+  * [Snort](https://www.snort.org/) - Network intrusion prevention system (NIPS) and network intrusion detection system (NIDS).
+  * [SpamAssassin](https://spamassassin.apache.org/) - A powerful and popular email spam filter employing a variety of detection technique.
+  * [Nmap](https://nmap.org) - Nmap is a free and open source utility for network discovery and security auditing. 
 
 ## Service Discovery
 
-* [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
-* [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
-* [etcd](https://github.com/coreos/etcd) - distributed K/V-Store, authenticating via SSL PKI and a REST HTTP Api for shared configuration and service discovery.
-* [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
+  * [Consul](http://www.consul.io/) - Consul is a tool for service discovery, monitoring and configuration.
+  * [Doozerd](https://github.com/ha/doozerd) - Doozer is a highly-available, completely consistent store for small amounts of extremely important data.
+  * [etcd](https://github.com/coreos/etcd) - distributed K/V-Store, authenticating via SSL PKI and a REST HTTP Api for shared configuration and service discovery.
+  * [ZooKeeper](http://zookeeper.apache.org/) - ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
 
-## Software Containers
-*Operating system–level virtualization.*
+  ## Software Containers
+  *Operating system–level virtualization.*
 
-* [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
-* [LXC](https://linuxcontainers.org/lxc/) - Userspace interface for the Linux kernel containment features.
-* [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
+  * [Docker](http://www.docker.com/) - Platform for developers and sysadmins to build, ship, and run distributed applications.
+  * [LXC](https://linuxcontainers.org/lxc/) - Userspace interface for the Linux kernel containment features.
+  * [OpenVZ](http://openvz.org) - Container-based virtualization for Linux.
 
 ## SSH
 *SSH tools.*
 
-* [Advanced SSH config](https://pypi.python.org/pypi/advanced-ssh-config/) - Enhances ssh_config file capabilities, completely transparent.
-* [autossh](http://www.harding.motd.ca/autossh/) - Automatically respawn ssh session after network interruption.
-* [Cluster SSH](http://sourceforge.net/projects/clusterssh/) - Controls a number of xterm windows via a single graphical console.
-* [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
-* [Mosh](http://mosh.mit.edu/) - The mobile shell.
-* [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
-* [ssh-cert-authority](https://github.com/cloudtools/ssh-cert-authority) - A democratic SSH certificate authority.
-* [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
-* [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
-* [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
-* [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
+  * [Advanced SSH config](https://pypi.python.org/pypi/advanced-ssh-config/) - Enhances ssh_config file capabilities, completely transparent.
+  * [autossh](http://www.harding.motd.ca/autossh/) - Automatically respawn ssh session after network interruption.
+  * [Cluster SSH](http://sourceforge.net/projects/clusterssh/) - Controls a number of xterm windows via a single graphical console.
+  * [DSH](http://www.netfort.gr.jp/~dancer/software/dsh.html.en) - Dancer's shell / distributed shell - Wrapper for executing multiple remote shell commands from one command line.
+  * [Mosh](http://mosh.mit.edu/) - The mobile shell.
+  * [parallel-ssh](http://code.google.com/p/parallel-ssh/) - Provides parallel versions of OpenSSH and related tools.
+  * [ssh-cert-authority](https://github.com/cloudtools/ssh-cert-authority) - A democratic SSH certificate authority.
+  * [ssh-ca](https://github.com/cloudtools/ssh-ca/) - Allows giving ssh access to servers without putting a users key on the server, as well as expiring access.
+  * [SSH Power Tool](http://code.google.com/p/sshpt/) - Execute commands and upload files to many servers simultaneously without using pre-shared keys.
+  * [sshrc](https://github.com/Russell91/sshrc) - sources ~/.sshrc on your local computer after logging in remotely.
+  * [stormssh](http://stormssh.readthedocs.org) - A command line tool to manage SSH connections.
 
 ## Statistics
 *Analytics software.*
 
-* [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
-* [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
-* [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
-* [Piwik](http://piwik.org/) - Web analytics application.
-* [Webalizer](http://www.webalizer.org/) - Fast web server log file analysis.
+  * [AWStats](http://www.awstats.org/) - Generates web, streaming, ftp or mail server statistics graphically.
+  * [GoAccess](http://goaccess.io/) - Real-time web log analyzer and interactive viewer that runs in a terminal.
+  * [Open Web Analytics](http://www.openwebanalytics.com/) - Add web analytics to websites using JS, PHP or REST APIs.
+  * [Piwik](http://piwik.org/) - Web analytics application.
+  * [Webalizer](http://www.webalizer.org/) - Fast web server log file analysis.
 
 ## Status Pages
 
-* [Cachet](https://cachethq.io) - Status page system written in PHP.
-* [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
-* [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
-* [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
+  * [Cachet](https://cachethq.io) - Status page system written in PHP.
+  * [Stashboard](http://www.stashboard.org) - Status page for cloud services and APIs.
+  * [System Status Dashboard (SSD)](http://www.system-status-dashboard.com/) - Overview about an organization's infrastructure health status.
+  * [Staytus](http://staytus.co/) - Staytus is a complete solution for publishing the latest information about any issues with your web applications, networks or services.
 
 ## Ticketing systems
 *Web-based ticketing system.*
 
-* [Bugzilla](http://www.bugzilla.org/) - General-purpose bugtracker and testing tool originally developed and used by the Mozilla project.
-* [Cerb](http://www.cerberusweb.com/) - Group-based e-mail management project.
-* [Flyspray](http://flyspray.org) - Web-based bug tracking system written in PHP.
-* [MantisBT](http://www.mantisbt.org/) - Web-based bug tracking system.
-* [osTicket](http://osticket.com/) - Simple support ticket system.
-* [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications.
-* [Request Tracker](http://www.bestpractical.com/rt/) - Ticket-tracking system written in Perl.
-* [TheBugGenie](http://www.thebuggenie.com) - Ticket system with extensive user rights system.
+  * [Bugzilla](http://www.bugzilla.org/) - General-purpose bugtracker and testing tool originally developed and used by the Mozilla project.
+  * [Cerb](http://www.cerberusweb.com/) - Group-based e-mail management project.
+  * [Flyspray](http://flyspray.org) - Web-based bug tracking system written in PHP.
+  * [MantisBT](http://www.mantisbt.org/) - Web-based bug tracking system.
+  * [osTicket](http://osticket.com/) - Simple support ticket system.
+  * [OTRS](http://www.otrs.com/) - Trouble ticket system for assigning tickets to incoming queries and tracking further communications.
+  * [Request Tracker](http://www.bestpractical.com/rt/) - Ticket-tracking system written in Perl.
+  * [TheBugGenie](http://www.thebuggenie.com) - Ticket system with extensive user rights system.
 
 ## Troubleshooting
 *Troubleshooting Tools.*
 
-+ [grml](https://grml.org) – bootable Debian Live CD with powerful CLI tools.
-* [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
-* [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
-* [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
+  + [grml](https://grml.org) – bootable Debian Live CD with powerful CLI tools.
+  * [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
+  * [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
+  * [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
 
 ## Version control
 *Software versioning and revision control.*
 
-* [Fossil](http://www.fossil-scm.org/) - Distributed version control with built-in wiki and bug tracking.
-* [Git](http://git-scm.com/) - Distributed revision control and source code management (SCM) with an emphasis on speed.
-* [GNU Bazaar](http://bazaar.canonical.com/) - Distributed revision control system sponsored by Canonical.
-* [Mercurial](http://mercurial.selenic.com/) - Another distributed revision control.
-* [Subversion](http://subversion.apache.org/) - Client-server revision control system.
+  * [Fossil](http://www.fossil-scm.org/) - Distributed version control with built-in wiki and bug tracking.
+  * [Git](http://git-scm.com/) - Distributed revision control and source code management (SCM) with an emphasis on speed.
+  * [GNU Bazaar](http://bazaar.canonical.com/) - Distributed revision control system sponsored by Canonical.
+  * [Mercurial](http://mercurial.selenic.com/) - Another distributed revision control.
+  * [Subversion](http://subversion.apache.org/) - Client-server revision control system.
 
 ## Virtualization
 *Virtualization software.*
 
-* [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
-* [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your KVM or Xen virtualized environment.
-* [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
-* [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
-* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
-* [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems.
-* [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
-* [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
-* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
-* [QEMU](http://www.qemu.org/) - QEMU is a generic machine emulator and virtualizer.
-* [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
-* [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
-* [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
+  * [Archipel](http://archipelproject.org/) - XMPP based virtualization management platform.
+  * [ConVirt](http://www.convirture.com/products_opensource.php) - Provides the core functionality for centrally managing your KVM or Xen virtualized environment.
+  * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
+  * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
+  * [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
+  * [OpenNode](http://opennodecloud.com) - Builds open-source infrastructure management software and implements cloud systems.
+  * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
+  * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
+  * [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Virtualization management solution.
+  * [QEMU](http://www.qemu.org/) - QEMU is a generic machine emulator and virtualizer.
+  * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
+  * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
+  * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.
 
 ## VPN
 *VPN software.*
 
-* [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange.
-* [Pritunl](http://pritunl.com/) - OpenVPN based solution. Easy to set up.
-* [SoftEther](https://www.softether.org/) - Multi-protocol software VPN with advanced features
-* [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
-* [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
-* [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
+  * [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange.
+  * [Pritunl](http://pritunl.com/) - OpenVPN based solution. Easy to set up.
+  * [SoftEther](https://www.softether.org/) - Multi-protocol software VPN with advanced features
+  * [sshuttle](https://github.com/apenwarr/sshuttle) - Poor man's VPN.
+  * [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux.
+  * [tinc](http://www.tinc-vpn.org/) - Distributed p2p VPN.
 
 ## XMPP
 *XMPP servers.*
 
-* [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server written in Erlang/OTP.
-* [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM.
-* [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
-* [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server.
-* [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
-* [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
+  * [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server written in Erlang/OTP.
+  * [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM.
+  * [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
+  * [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server.
+  * [Prosody IM](http://prosody.im/) - XMPP server written in Lua.
+  * [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
 
 *XMPP Web Clients*
 
-* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
-* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives.
-* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
+  * [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
+  * [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives.
+  * [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
 
 ## Web
 *Web servers.*
 
-* [Apache](http://httpd.apache.org/) - Most popular web server.
-* [Cherokee](http://cherokee-project.com/) - Lightweight, high-performance web server/reverse proxy.
-* [Lighttpd](http://www.lighttpd.net/) - Web server more optimized for speed-critical environments.
-* [Nginx](http://nginx.org/) - Reverse proxy, load balancer, HTTP cache, and web server.
-* [uWSGI](https://github.com/unbit/uwsgi/) - The uWSGI project aims at developing a full stack for building hosting services.
+  * [Apache](http://httpd.apache.org/) - Most popular web server.
+  * [Cherokee](http://cherokee-project.com/) - Lightweight, high-performance web server/reverse proxy.
+  * [Lighttpd](http://www.lighttpd.net/) - Web server more optimized for speed-critical environments.
+  * [Nginx](http://nginx.org/) - Reverse proxy, load balancer, HTTP cache, and web server.
+  * [uWSGI](https://github.com/unbit/uwsgi/) - The uWSGI project aims at developing a full stack for building hosting services.
 
 *Web Performance*
 
-* [HAProxy](http://www.haproxy.org/) - Software based load Balancing, SSL offloading and performance optimization, compression, and general web routing.
-* [Varnish](https://www.varnish-cache.org/) - HTTP based web application accelerator focusing on optimizing caching and compression.
+  * [HAProxy](http://www.haproxy.org/) - Software based load Balancing, SSL offloading and performance optimization, compression, and general web routing.
+  * [Varnish](https://www.varnish-cache.org/) - HTTP based web application accelerator focusing on optimizing caching and compression.
 
 
 ## Wiki Software
@@ -635,61 +638,61 @@ Various resources, such as books, websites and articles, for improving your skil
 
 ## Blogs
 
-* [Code as Craft](http://codeascraft.com/) - Etsy's Ops blog, lots of technical posts.
-* [DevOpsGuys](http://blog.devopsguys.com/) - Devops consultants who blog about operations.
-* [Rackspace Developers](http://developer.rackspace.com/blog/) - Slightly biased blog with lots of Devops Topics.
+  * [Code as Craft](http://codeascraft.com/) - Etsy's Ops blog, lots of technical posts.
+  * [DevOpsGuys](http://blog.devopsguys.com/) - Devops consultants who blog about operations.
+  * [Rackspace Developers](http://developer.rackspace.com/blog/) - Slightly biased blog with lots of Devops Topics.
 
 ## Books
 *Sysadmin related books.*
 
-* [The Linux Command Line](http://linuxcommand.org/tlcl.php) - A book about the Linux command line by William Shotts.
-* [The Phoenix Project: A Novel about IT, DevOps, and Helping Your Business Win](http://itrevolution.com/books/phoenix-project-devops-book/) - How DevOps techniques can fix the problems that happen in IT organizations.
-* [The Practice of System and Network Administration](http://everythingsysadmin.com/books.html) - The first and second editions describes the best practices of system and network administration, independent of specific platforms or technologies.
-* [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
-* [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
+  * [The Linux Command Line](http://linuxcommand.org/tlcl.php) - A book about the Linux command line by William Shotts.
+  * [The Phoenix Project: A Novel about IT, DevOps, and Helping Your Business Win](http://itrevolution.com/books/phoenix-project-devops-book/) - How DevOps techniques can fix the problems that happen in IT organizations.
+  * [The Practice of System and Network Administration](http://everythingsysadmin.com/books.html) - The first and second editions describes the best practices of system and network administration, independent of specific platforms or technologies.
+  * [The Visible Ops Handbook: Implementing ITIL in 4 Practical and Auditable Steps](http://www.itpi.org/the-visible-ops-handbook-review.html) - Is a methodology designed to jumpstart implementation of controls and process improvement.
+  * [UNIX and Linux System Administration Handbook](http://www.admin.com/) - Approaches system administration from a practical perspective.
 
 ## Communities / Forums
 *For the social people.*
 
-* [ArsTechnica OpenForum](http://arstechnica.com/civis/) – IT Forum which is attached to a large news site.
-* [Reddit](https://www.reddit.com) - Really, really large bulletin board system.
-  * [/r/Linux](https://www.reddit.com/r/linux) - News and information about Linux.
-  * [/r/LinuxQuestions](https://www.reddit.com/r/linuxquestions)
-  * [/r/SysAdmin](https://www.reddit.com/r/sysadmin/)
-* [Spiceworks Community](https://community.spiceworks.com/start) – General enterprise IT news and small articles.
-* [StackExchange Network](https://stackexchange.com/sites#technology) – Q&A communities.
-  * [Server Fault](https://serverfault.com/) – StackExchange community for system and network administrators.
+  * [ArsTechnica OpenForum](http://arstechnica.com/civis/) – IT Forum which is attached to a large news site.
+  * [Reddit](https://www.reddit.com) - Really, really large bulletin board system.
+    * [/r/Linux](https://www.reddit.com/r/linux) - News and information about Linux.
+    * [/r/LinuxQuestions](https://www.reddit.com/r/linuxquestions)
+    * [/r/SysAdmin](https://www.reddit.com/r/sysadmin/)
+  * [Spiceworks Community](https://community.spiceworks.com/start) – General enterprise IT news and small articles.
+  * [StackExchange Network](https://stackexchange.com/sites#technology) – Q&A communities.
+    * [Server Fault](https://serverfault.com/) – StackExchange community for system and network administrators.
 
 ## Newsletters
 
-* [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
-* [Web Operations Weekly](http://webopsweekly.com/) - A weekly newsletter on Web operations, infrastructure, performance, and tooling, from the browser down to the metal.
+  * [Servers for Hackers](http://serversforhackers.com/) - Newsletter for programmers who find themselves needing to know their way around a server.
+  * [Web Operations Weekly](http://webopsweekly.com/) - A weekly newsletter on Web operations, infrastructure, performance, and tooling, from the browser down to the metal.
 
 ## Repositories
 *Software package repositories.*
 
-* [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
+  * [AlternativeTo](http://alternativeto.net) - Find alternatives to software you know and discover new software.
 
 ### Debian-based distributions
-* [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
+  * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages for Debian.
 
 ### RPM-based distributions
-* [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
-* [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
-* [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
-* [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
+  * [ElRepo](http://elrepo.org/tiki/tiki-index.php) - Community Repo for Enterprise Linux (RHEL, CentOS, etc).
+  * [EPEL](https://fedoraproject.org/wiki/EPEL) - Repository for RHEL and compatibles (CentOS, Scientific Linux).
+  * [Remi](http://rpms.famillecollet.com/) - Repository with LAMP updated packages for RHEL/Centos/Fedora.
+  * [Software Collections](https://www.softwarecollections.org) - Community Release of [Red Hat Software Collections](https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/). Provides updated packages of Ruby, Python, etc. for CentOS/Scientific Linux 6.x.
 
 ## Websites
 *Useful sysadmin related websites.*
 
-* [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
-* [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
+  * [Ops School](http://www.opsschool.org) - Comprehensive program that will help you learn to be an operations engineer.
+  * [Digital Ocean Tutorials](https://www.digitalocean.com/community/tutorials) - A surprisingly vast resource for getting the basics of certain applications, tools, or even systems administration topics.
 
 ## Wikis
 *Useful Wikis for Sysadmins – not to be confused with Wiki software.*
 
-* [ArchWiki](https://wiki.archlinux.org/) – Arch Linux Wiki which has really nice written articles valid for other distros.
-* [Gentoo Wiki](https://wiki.gentoo.org/) - Gentoo Linux Wiki with a lot in-detail description of Linux components.
+  * [ArchWiki](https://wiki.archlinux.org/) – Arch Linux Wiki which has really nice written articles valid for other distros.
+  * [Gentoo Wiki](https://wiki.gentoo.org/) - Gentoo Linux Wiki with a lot in-detail description of Linux components.
 
 ## License
 
-- 
GitLab


From 18e4867dc7e3b57f1fbc54a1244d721129440ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <me@arcx.es>
Date: Wed, 7 Oct 2015 10:43:13 +0200
Subject: [PATCH 191/193] Added N1 to mail clients

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 91b9f43..42d604e 100644
--- a/README.md
+++ b/README.md
@@ -339,6 +339,7 @@
   * [Claws Mail](http://www.claws-mail.org/) - Old school email client (and news reader), based on GTK+.
   * [Mutt](http://www.mutt.org/) - Small but very powerful text-based mail client.
   * [Thunderbird](https://www.mozilla.org/de/thunderbird/) - Free email application that's easy to set up and customize.
+  * [N1](https://nylas.com/N1) - Extensible mail client.
 
 
 ## Mail servers/webmail
-- 
GitLab


From 11f303eab68d98fb16cb24771c44f3395bc1a397 Mon Sep 17 00:00:00 2001
From: Homelaber Brasil <homelaber@homelaber.com.br>
Date: Mon, 20 Jun 2016 22:54:53 -0300
Subject: [PATCH 192/193] Create manifesto

---
 manifesto | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 manifesto

diff --git a/manifesto b/manifesto
new file mode 100644
index 0000000..e1b173d
--- /dev/null
+++ b/manifesto
@@ -0,0 +1,55 @@
+# The awesome manifesto
+
+If you want your list to be included on `awesome`, try to only include actual awesome stuff in your list. After all, it's a curation, not a collection.
+
+But **what is awesome?**
+
+## Only awesome is awesome
+
+Research if the stuff you're including is actually awesome. Put only stuff on the list you or another contributor can personally recommend and rather leave stuff out than include too much.
+
+## Awesome badge
+
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+
+Add an awesome badge to the top of your list, right to the title. [Example](https://github.com/sindresorhus/awesome-nodejs).
+
+```md
+[![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome)
+```
+
+## Comment on why something is awesome
+
+Apart from suggesting a particular item on your list, you should also inform your readers *why* it's on the list and how they will benefit from it.
+
+## Make it clear what the list is about
+
+Have a succinct description at the top of your readme. Make sure your list covers a certain scope and nothing else. Link to other awesome lists if you think they already cover a certain subject good enough.
+
+## Pay attention to grammar
+
+Ensure your list is grammatically correct, typo free and has no Markdown formatting errors. This should also apply to pull requests.
+
+## Choose an appropriate license
+
+Keep in mind that if you [haven't selected a license](http://choosealicense.com/no-license/), it basically means the people are *not* allowed to reproduce, distribute or create derivative works.
+
+[Creative Commons licenses](https://creativecommons.org/) are perfect for this purpose. **We would recommend [`CC0`](https://creativecommons.org/publicdomain/zero/1.0/).** Code licenses like MIT, BSD, GPL, and so forth are not recommended.
+
+## Include contribution guidelines
+
+People who are contributing to your list should have a clear understanding how they should do so.
+
+If you don't feel like writing one from scratch, feel free to take our [contributing.md](contributing.md) and modify it to your own needs.
+
+## Stylize your list properly
+
+Create a table of contents, organize the content into different categories, and use images if suitable. Ensure all entries are consistent (e.g. all entry descriptions end in a `.`).
+
+## Accept other people's opinion
+
+If you're an owner of the list, respect other people's opinion. If there are plenty of users not agreeing to your decision, give it a second thought.
+
+## Discovery
+
+Link back to this list from your list so users can easily discover more lists.
-- 
GitLab


From a1f089c66c66fa5edf74044d047aa4d6995d79bc Mon Sep 17 00:00:00 2001
From: Homelaber Brasil <homelaber@homelaber.com.br>
Date: Mon, 20 Jun 2016 22:55:13 -0300
Subject: [PATCH 193/193] Rename manifesto to manifesto.md

---
 manifesto => manifesto.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename manifesto => manifesto.md (100%)

diff --git a/manifesto b/manifesto.md
similarity index 100%
rename from manifesto
rename to manifesto.md
-- 
GitLab