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

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-05-27 10:55:17 +02:00
commit d43597e947

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.
* [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`.
* [UrBackup](http://www.urbackup.org/) - Another client-server backup system. * [UrBackup](http://www.urbackup.org/) - Another client-server backup system.