Commit Graph

462 Commits

Author SHA1 Message Date
phre4k 8f1cf958a9 Merge branch 'master' into merge-patches 2015-04-07 08:37:43 +02:00
phre4k 3614b028cb Merge remote-tracking branch 'origin/pr/19' into merge-patches 2015-04-07 08:35:58 +02:00
Crack Duck 9b63ffaa52 Merge pull request #23 from dflock/patch-1
awesome-spelling is important.
2015-04-06 23:22:19 +02:00
Duncan Lock 5632df006d Spelling Corrections
Spellcheck pass, correcting several mistakes.
Not touched anything debatable - hyphenation, en_US/GB, capitalization etc..
2015-04-06 12:26:53 -07:00
Crack Duck 2c6670150a Merge pull request #14 from awiddersheim/patch-1
Add OSSEC to Security
2015-04-06 16:04:50 +02:00
Crack Duck 9ff9b32a49 Merge pull request #21 from FGRibreau/patch-1
Remove statuspage.io, fixes #20
2015-04-06 15:56:56 +02:00
Francois-Guillaume Ribreau 7338756747 Remove statuspage.io, fixes #20 2015-04-06 15:04:27 +02:00
Andrew Widdersheim 100b927b79 Shorten OSSEC description 2015-04-06 08:52:43 -04:00
Crack Duck 72c218a043 Merge pull request #18 from bliz937/master
Add sshrc to SSH
2015-04-06 13:45:33 +02:00
doertyDoerte! 1753ee4c3a Security: Updated to alphabetical
Relates to the following additions:

* [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.
2015-04-06 11:57:29 +02:00
doertyDoerte! 8a43dd8248 Add Security -> Kippo
[Kippo](https://github.com/desaster/kippo) is a cool sandbox, a standalone SSH daemon that can stand besides "the real" SSH daemon listening on another port, giving a sysadmin the ability to configure a whole FS sandbox.
2015-04-06 11:36:06 +02:00
doertyDoerte! a86e1ec8a7 Add Security -> Glastopf
[Glastopf](http://glastopf.org/) is a low interaction honeypot system which emulates vulnerabiltiies to gather data and make sense of the attacks that try to get into your system.
2015-04-06 11:30:38 +02:00
Crack Duck 6cc6a12477 Merge pull request #15 from jaseemabid/patch-1
Add phabricator to code review tools.
2015-04-06 11:22:04 +02:00
Crack Duck e439090026 Merge pull request #17 from Ernest0x/patch-1
Add Attic to Backup software
2015-04-06 11:12:37 +02:00
phre4k f66aaaaf0a created sub-categories for Repositories 2015-04-06 11:10:03 +02:00
Crack Duck ada7c6db0c Merge pull request #16 from rilindo/add_software_repo
Added Repos to Software Repositories
2015-04-06 11:05:06 +02:00
Vyacheslav Shevchenko a37db0265d fixed wrong placement 2015-04-06 10:55:19 +02:00
Vyacheslav Shevchenko 2ee2fe13e9 Added sshrc 2015-04-06 10:53:53 +02:00
Petros Moisiadis 718589d311 Add Attic to Backup software
Attic is a deduplicating backup program written in Python.
2015-04-06 10:17:07 +03:00
Rilindo Foster 3220d06f33 Added Repos 2015-04-05 20:40:21 -05:00
Jaseem Abid c03fc90838 Add phabricator to code review tools. 2015-04-06 06:19:13 +05:30
Andrew Widdersheim 02e5e3410f Add OSSEC
OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response.
2015-04-05 20:44:57 -04:00
phre4k 09cdb40063 added Snebu to Backup - closes #5 2015-04-05 20:34:33 +02:00
phre4k ceffae4ff8 removed Opsmatic (not FLOSS) 2015-04-05 16:30:17 +02:00
phre4k 9417a3b9d5 merged kahun/pr/153 2015-04-05 16:26:28 +02:00
phre4k 8bd42685f3 Merge remote-tracking branch 'kahun/pr/263' into merge-patches 2015-04-05 16:21:00 +02:00
Crack Duck 00176a7cef Merge pull request #12 from adrianblynch/patch-1
Link update for LevelDB in NoSQL
2015-04-05 14:15:13 +02:00
phre4k c92191b671 merged master 2015-04-05 14:09:01 +02:00
phre4k ab6d565a13 shortened descriptions in Ticketing systems 2015-04-05 14:05:12 +02:00
phre4k ead1256ba5 Merge branch 'master' of github.com:n1trux/awesome-sysadmin 2015-04-05 14:00:43 +02:00
phre4k 16f659874a added OWA to and shortened descriptions in Statistics 2015-04-05 14:00:25 +02:00
phre4k c5494c5a63 trying to clarify contribution guidelines 2015-04-05 13:56:08 +02:00
Adrian Lynch 5d3ef3f29b Link update 2015-04-05 12:20:47 +01:00
Crack Duck 7ab98b1162 Merge pull request #6 from spuder/patch-2
Add Apache Kafka
2015-04-05 08:50:54 +02:00
Geoffrey Anderson af8a7f7184 Adding lazlo to ChatOps category 2015-04-04 22:33:15 -07:00
Geoffrey Anderson 23347591fd New category - ChatOps 2015-04-04 22:30:49 -07:00
Spencer Owen 5d9b8d5f0e Add Apache Kafka 2015-04-04 17:10:23 -06:00
phre4k adfaebbc22 merging from @falzm 2015-04-04 18:20:28 +02:00
phre4k f530460ed0 Merge branch 'merge-patches' 2015-04-04 12:56:34 +02:00
phre4k 5f321294d7 Merge branch 'master' of github.com:n1trux/awesome-sysadmin 2015-04-04 12:54:12 +02:00
Crack Duck 75dd31c7f8 clarified language, removed more please 2015-04-04 12:43:09 +02:00
phre4k 109666e8e0 linked to n1trux/awesome-awesomeness in the introduction 2015-04-04 12:32:18 +02:00
phre4k 54aaece303 Revert "tried out relative link to awesome-awesomeness"
This reverts commit 9afb210010.
2015-04-04 12:30:40 +02:00
phre4k 9afb210010 tried out relative link to awesome-awesomeness 2015-04-04 12:29:36 +02:00
Crack Duck 2e38aaa200 Merge pull request #2 from liquiddandruff/freeboard
Add freeboard to Metrics
2015-04-04 12:19:46 +02:00
Steven Huang 2c3b829486 Changed Freeboard category 2015-04-04 01:47:30 -07:00
Steven Huang e6b5d4d7e3 Add freeboard to Monitoring
This is a great data viewer that's originally intended to easily display sensor data from IoT devices, but we have been using this in-house for a while to show disparate JSON data and it has been a joy to use. 

Check out the demos at http://freeboard.io/ and see for yourself!
2015-04-04 01:43:14 -07:00
phre4k b8476c49f5 added Froxlor, Sentora, Webmin to Hosting Control Panels 2015-04-04 08:50:01 +02:00
phre4k 87a8986a8d added LXC (suggestion from @vermaden) 2015-04-04 08:45:19 +02:00
phre4k 4256df65c3 added pfSense firewall to 'Security' 2015-04-04 06:42:58 +02:00