Merge branch 'patch-1' of https://github.com/wendigo/awesome-sysadmin into wendigo-patch-1

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-06-24 18:48:19 +02:00
commit 8f852eb927

View File

@ -84,6 +84,7 @@ 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. * [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) - 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.
## Configuration Management ## Configuration Management
*Configuration management tools.* *Configuration management tools.*
@ -149,6 +150,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
* [GLPI](http://www.glpi-project.org/spip.php?lang=en) - Information Resource-Manager with an additional Administration Interface. * [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. * [OCS Inventory NG](http://www.ocsinventory-ng.org/en/) - Enables users to inventory their IT assets.
* [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. * [Snipe IT](http://snipeitapp.com/) - Asset & license management software.
## LDAP ## LDAP