Commit Graph

1139 Commits

Author SHA1 Message Date
lbriggs
dc8cacdafb Cleanup 2015-04-12 22:18:03 +01:00
lbriggs
c668663474 Merge branch 'master' of github.com:jaxxstorm/awesome-sysadmin
Conflicts:
	README.md
2015-04-12 22:15:32 +01:00
lbriggs
4b5480345f Adding packetbeat, osquery and Prometheus 2015-04-12 22:13:45 +01:00
lbriggs
f4dfe6b369 Adding some XMPP web chat clients 2015-04-12 22:07:14 +01:00
TETYYS
2dbb6e926c Added Citadel mail server
Added Citadel mail server in "complete solution mail servers" category
2015-04-12 23:04:14 +03:00
Meir Wahnon
38c511becb Add CloudSlang project
Add CloudSlang project to Cloud Orchestration category
2015-04-12 22:17:43 +03:00
phre4k
3d0ae07ff6 remove opsview (license), closes #34 2015-04-10 10:58:32 +02:00
Crack Duck
467ed721c0 Merge pull request #33 from smbambling/add_mdwiki
Add MDwiki to Wikis
2015-04-09 20:48:22 +02:00
Steven Bambling
7c607f5b71 add MDwiki 2015-04-09 14:38:49 -04:00
phre4k
d9d7075ee8 added advanced-ssh-config (@mgarces in kahun/pr/268) 2015-04-09 15:04:44 +02:00
Crack Duck
0ba213b218 Merge pull request #30 from frdmn/master
Add CloudBot
2015-04-09 14:57:11 +02:00
Crack Duck
de02996ae3 Merge pull request #32 from Calinou/master
Add CC BY-SA 4.0 International license (closes #29)
2015-04-09 13:09:19 +02:00
Calinou
3abf5b4f63 Add CC BY-SA 4.0 International license 2015-04-09 13:05:50 +02:00
Jonas Friedmann
e2bd1722d2 Add CloudBot 2015-04-09 12:21:14 +02:00
Crack Duck
41e0847cb1 Merge pull request #28 from jan0sch/fwknop
Add link to fwknop
2015-04-08 18:47:07 +02:00
phre4k
e1eb707555 added Cockpit, restructured Control Panels, closes #27 2015-04-08 10:23:08 +02:00
Jens Jahnke
9c94e9dbf4 Add link to fwknop
The `fwknop` tool is very useful to protect services on servers via
single packet authorization.
2015-04-08 08:14:16 +02:00
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
8ddc79545d Remove bitnami which is not a Open Source software 2015-04-06 15:05:19 +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