1
0
mirror of https://github.com/namibia/awesome-sysadmin.git synced 2024-11-13 00:36:32 +00:00

Fixed merged conflicts

This commit is contained in:
Francisco Augusto 2016-11-09 13:47:41 +01:00
parent e61f070820
commit 6e129b026f

View File

@ -509,7 +509,6 @@ Please read [CONTRIBUTING](./CONTRIBUTING.md) if you wish to add software.
* [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.
<<<<<<< HEAD
* [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.