Merge branch 'master' of https://github.com/cericoda/awesome-sysadmin into cericoda-master

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-05-27 10:57:48 +02:00
commit 1cbc17f117

View File

@ -43,6 +43,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
* [Amanda](http://www.amanda.org/) - Client-server model backup tool. * [Amanda](http://www.amanda.org/) - Client-server model backup tool.
* [Bacula](http://www.bacula.org) - Another Client-server model backup tool. * [Bacula](http://www.bacula.org) - Another Client-server model backup tool.
* [Backuppc](http://backuppc.sourceforge.net/) - Client-server model backup tool with file pooling scheme.
* [Burp](http://burp.grke.org/) - Network backup and restore program. * [Burp](http://burp.grke.org/) - Network backup and restore program.
* [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility. * [Rsnapshot](http://www.rsnapshot.org/) - Filesystem Snapshotting Utility.
* [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`. * [SafeKeep](http://safekeep.sourceforge.net/) - Centralized pull-based backup using `rdiff-backup`.