Commit Graph

809 Commits

Author SHA1 Message Date
phre4k
45e119b2af fixed link to communities category 2015-05-05 11:38:23 +02:00
phre4k
380bb28785 linked new categories, hope that'll work 2015-05-05 11:37:26 +02:00
phre4k
ac64dbf25c added Resources/{Communities,Wikis} 2015-05-05 11:34:42 +02:00
Crack Duck
7f225324b0 Merge pull request #43 from doertedev/patch-1
Add Service discovery -> etcd
2015-05-04 18:50:34 +02:00
doertyDoerte!
5781915316 Add Service discovery -> etcd
[etcd](https://github.com/coreos/etcd) - distributed, consistent key value store for shared configuration and service discovery
2015-05-04 10:09:49 +02:00
Crack Duck
a20958f11d Merge pull request #42 from timmmmyboy/master
Add Linux Malware Detect (LMD)
2015-04-15 23:07:00 +02:00
Tim Owens
d7fdde520a Add Linux Malware Detect (LMD) 2015-04-14 21:08:02 -04:00
Crack Duck
f83b6b8ce8 Merge pull request #41 from RasPat1/patch-1
Add weekly devops newsletter resource
2015-04-14 18:06:27 +02:00
Rasesh Patel
0f578756a3 Use Web Operations Weekly's title and description 2015-04-14 12:01:45 -04:00
Rasesh Patel
c247c9be1c Add weekly devops newsletter resource 2015-04-14 01:25:40 -04:00
Crack Duck
380605a5d7 Merge pull request #39 from 0x70ad57001/addition-kdevelop
Addition KDevelop.
2015-04-13 23:54:28 +02:00
Crack Duck
7e6362b78f Merge pull request #36 from TETYYS/master
Added Citadel mail server
2015-04-13 23:54:06 +02:00
Crack Duck
3fc0697bb3 Merge pull request #35 from meirwah/master
Add CloudSlang project
2015-04-13 23:53:57 +02:00
Crack Duck
31eaae59a0 Merge pull request #40 from xezpeleta/master
Add Elkarbackup
2015-04-13 23:52:44 +02:00
Crack Duck
11ca6b703b Merge pull request #37 from jaxxstorm/master
Multiple additions
2015-04-13 23:51:42 +02:00
Xabi
0548ca1814 Fix Elkarbackup link 2015-04-13 20:52:14 +02:00
Xabi
0b797ae2f8 Add Elkarbackup 2015-04-13 20:48:08 +02:00
0x70ad57001
96c79fb379 Add KDevelop. 2015-04-13 08:14:40 -04:00
lbriggs
3ebcffa300 Adding Archipel 2015-04-12 22:21:32 +01:00
lbriggs
a29af5177a Removing some dupes 2015-04-12 22:20:00 +01:00
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