summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* //Monitoring: add shinken configsroot2011-11-18214-0/+9194
* Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-152-0/+11
|\
| * m0ar defaultroutes!lassulus2011-11-151-0/+1
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-141-1/+5
| |\
| * | added host picolassulus2011-11-141-0/+10
* | | //monitoring: add new shinken monitoring stuffEUcancER2011-11-151-0/+9
| |/ |/|
* | Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-141-0/+1
|\|
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2011-11-142-0/+59
| |\
| * | added default route Styxlassulus2011-11-141-0/+1
* | | //cholerab/news/Candidate: add Ticket UpdateEUcancER2011-11-141-1/+5
| |/ |/|
* | //cholerab/news/Candidate: add 28c3 ticket fetchermakefu2011-11-141-0/+6
* | Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-146-0/+160
|\|
| * added portforwardinglassulus2011-11-141-1/+4
| * tincrouting ftw!lassulus2011-11-141-0/+6
| * added defaultroutelassulus2011-11-141-0/+1
| * //cholerab krebs-v2.xpm: initial committv2011-11-131-0/+24
| * Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-123-0/+126
| |\
| | * Merge branch 'master' of github.com:krebscode/painloadtv2011-11-128-8/+102
| | |\
| | | * Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-111-0/+9
| | | |\
| | | * | //punani/tightnani: initial commitEUcancER2011-11-112-0/+73
| | * | | //cholerab/reports/Empera.txt: initial committv2011-11-111-0/+53
| * | | | //census: update readmemakefu2011-11-121-3/+13
| | |_|/ | |/| |
* | | | //census: update Readmemakefu2011-11-141-3/+13
* | | | //too_old: add script to fetch 28C3 ticketsmakefu2011-11-141-0/+53
|/ / /
* | | Merge branch 'master' of github.com:krebscode/painloadmakefu2011-11-115-8/+20
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:krebscode/painloadEUcancER2011-11-101-1/+1
| |\|
| * | //retiolum/adv_graphgen: refactor graph generation, fix weight issueEUcancER2011-11-103-8/+17
| * | .gitmodules: add python-irclib for ircbotsEUcancER2011-11-102-0/+3
* | | //infest/profiles: initial draft for profile depoyermakefu2011-11-111-0/+9
| |/ |/|
* | //retiolum hosts also controls 23.42/16tv2011-11-101-1/+1
|/
* //oncology: use 42/8tv2011-11-101-1/+1
* //retiolum hosts: killall Subnet = 10.7.7/24tv2011-11-1043-50/+0
* //retiolum tinc-up: first set up interface, then configuretv2011-11-101-2/+2
* //retiolum Makefile update: show unified contexttv2011-11-101-1/+1
* //retiolum pgrep-retiolum-tincd-args: fix regextv2011-11-101-1/+1
* //retiolum update: cp tinc-up and restart tincdtv2011-11-104-8/+24
* //retiolum tinc-up: use iproute2 onlytv2011-11-101-9/+7
* //retiolum tinc-up: fix ipv4 netmasktv2011-11-091-3/+4
* update_tinc_hosts fixed by tvlassulus2011-11-091-1/+1
* //retiolum install.sh: more ipv4-adaptionstv2011-11-091-2/+2
* Merge branch 'master' of github.com:krebscode/painloadtv2011-11-091-1/+1
|\
| * fixed random in iplassulus2011-11-091-1/+1
* | //retiolum tinc-up: adapt ipv4-rangetv2011-11-091-2/+2
|/
* //retiolum hosts: fillxx ipv4tv2011-11-0945-0/+45
* //cholerab assets usecases: add "name"-use-casestv2011-11-091-0/+9
* //retiolum install.sh: use fillxx for IPv4 (inactive)tv2011-11-091-0/+4
* //retiolum hosts also: add nebula ipv4 addrtv2011-11-091-0/+1
* Merge branch 'master' of github.com:krebscode/painloadtv2011-11-083-10/+8
|\
| * Merge branch 'master' of github.com:krebscode/painloadkrebs2011-11-0810-27/+223
| |\
| * | //noise/Makefile: add sudo powers for streamskrebs2011-11-081-0/+2