diff --git a/README.md b/README.md index 102689e..23580e4 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,12 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [Cloud Storage](#cloud-storage) * [Configuration Management Database](#configuration-management-database) * [Configuration Management](#configuration-management) - * [Continuous integration](#continuous-integration) + * [Continuous Integration](#continuous-integration) * [Distributed Filesystems](#distributed-filesystems) * [DNS](#dns) * [Hosting Control Panels](#hosting-control-panels) * [IMAP/POP3](#imappop3) - * [IT Asset Management](#it-asset-management) + * [IT Asset Management](#it-asset-management) * [LDAP](#ldap) * [Monitoring](#monitoring) * [Network Configuration Management](#network-configuration-management) @@ -77,10 +77,11 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [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. -## Continuous integration +## Continuous Integration *Continuous integration software.* * [Go](http://www.thoughtworks.com/products/go-continuous-delivery) - Open source agile build and release management software. +* [GitLab CI](https://www.gitlab.com/gitlab-ci/) - Based off of ruby. They also provide GitLab, which manages git repositories. * [Jenkins](http://jenkins-ci.org/) - An extendable open source continuous integration server. ## Distributed Filesystems @@ -105,6 +106,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ *Web hosting control panels* * [ISPConfig](http://www.ispconfig.org) - Hosting control panel for Linux. +* [VestaCP](http://www.vestacp.com/) - Hosting panel for Linux but with Nginx. * [Virtualmin](http://www.virtualmin.com/) - Control panel for Linux based on webmin. ## IMAP/POP3 @@ -134,7 +136,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ *Monitoring software.* * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool. -* [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios, +* [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios. * [Icinga](https://www.icinga.org/) - Fork of Nagios. * [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. @@ -143,6 +145,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [Sensu](http://sensuapp.org/) - Open source monitoring framework. * [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. +* [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux. * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother. * [Zabbix](http://www.zabbix.com/) - Eenterprise-class software for monitoring of networks and applications * [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope. @@ -239,6 +242,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v * [OpenVPN](https://community.openvpn.net) - Uses a custom security protocol that utilizes SSL/TLS for key exchange. * [SoftEther VPN](https://www.softether.org/) - Alternative to OpenVPN. * [strongSwan](http://www.strongswan.org/) - Complete IPsec implementation for Linux. +* [Pritunl](http://pritunl.com/) - OpenVPN based solution. Easy to set up. ## Webmails *Webmail applications.* @@ -287,4 +291,4 @@ Various resources, such as books, websites and articles, for improving your skil * [Dotdeb](http://www.dotdeb.org/) - Repository with LAMP updated packages. # Contributing -Please see [CONTRIBUTING](https://github.com/kahun/awesome-sysadmin/blob/master/CONTRIBUTING.md) for details. \ No newline at end of file +Please see [CONTRIBUTING](https://github.com/kahun/awesome-sysadmin/blob/master/CONTRIBUTING.md) for details.