summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of pnp:stockholmmakefu2015-11-181-3/+27
|\
| * unstable -> s 2 shack-drivedroidmakefu2015-11-181-3/+27
* | Merge branch 'master' of http://cgit.cd/stockholmmakefu2015-11-171-0/+10
|\ \ | |/ |/|
| * Zhosts: add strotv2015-11-171-0/+10
* | Merge remote-tracking branch 'cd/master'makefu2015-11-1713-0/+1250
|\|
| * mv: inittv2015-11-1713-0/+1250
* | shared 1 wolf: add self to binaryCachemakefu2015-11-171-0/+4
* | s 2 drivedroid: fix syntax errormakefu2015-11-171-2/+2
* | acng: also add nar files to cachemakefu2015-11-171-1/+1
* | k 3 apt-cacher-ng: add CAfilemakefu2015-11-171-0/+1
* | k 3 shared: shack ip was already in usemakefu2015-11-171-1/+1
* | k 5 drivedroid-gen-repo: init at 0.4.2makefu2015-11-171-0/+22
* | makefu: fix cgit for wry, add gc to wrymakefu2015-11-172-13/+18
* | pubkeys: add excomakefu2015-11-171-0/+1
* | shared wolf: static ip, fix todomakefu2015-11-175-6/+74
* | shared 2 base: add makefu_omo to allowed pubkeysmakefu2015-11-171-0/+2
* | m 2 git: fix library and irc hooksmakefu2015-11-172-17/+33
* | m 1 gum: add ssh repomakefu2015-11-171-0/+1
* | apt-cacher-ng is imported by krebs modulesmakefu2015-11-171-0/+1
* | k 3 apt-cacher-ng: fix whitespacemakefu2015-11-171-34/+35
* | apt-cacher-ng: init package and modulemakefu2015-11-172-0/+176
* | Merge branch 'master' of pnp:stockholmmakefu2015-11-153-19/+24
|\ \
| * | m 1 {gum,wry}: disable dropped packet loggingmakefu2015-11-131-3/+6
| * | tinc_graphs: always restartmakefu2015-11-131-1/+1
| * | m 1 gum: disable ipv6, open up fwmakefu2015-11-131-15/+17
* | | Merge remote-tracking branch 'cloudkrebs/master' into pre-mergemakefu2015-11-1440-336/+1055
|\ \ \
| * | | shared: add os templates to 2lassulus2015-11-132-0/+94
| * | | l 1 prism: import weechat.nixlassulus2015-11-131-0/+1
| * | | l 2 weechat: bring everything up2datelassulus2015-11-131-8/+23
| * | | l: use bitlbee plugin architecture from nixpkgslassulus2015-11-135-135/+6
| * | | l 2 base: nixpkgs 7ae05ed -> 8d1ce12lassulus2015-11-131-1/+1
| * | | l 5 go -> k 5 golassulus2015-11-133-4/+3
| * | | move testhosts to shared from lasslassulus2015-11-135-42/+38
| * | | shared: move stuff from 1/wolf.nix to 2/base.nixlassulus2015-11-132-70/+75
| * | | l 2 base: add monitoring toolslassulus2015-11-131-0/+4
| |/ /
| * | l 2 git: make prism verbose hostlassulus2015-11-131-1/+1
| * | l 2 go: adapt to lass.go -> krebs.golassulus2015-11-131-4/+1
| * | l 3 go -> k 3 golassulus2015-11-133-3/+3
| * | l 1 mors: open risk of rain port for lanlassulus2015-11-131-0/+6
| * | l 1 mors: use new wordpress testlassulus2015-11-131-1/+22
| * | l: use new xserver architecturelassulus2015-11-1310-29/+527
| * | l 1 prism: add stuff for oneline httpserverlassulus2015-11-131-0/+8
| * | l 1 echelon: disable redislassulus2015-11-131-1/+1
| * | l 2 base: nixpkgs rev 6d31e9b -> 7ae05edlassulus2015-11-131-1/+1
| * | l 2 browsers: add simpleScriptlassulus2015-11-131-1/+9
| * | l 4: remove simpleScriptlassulus2015-11-131-11/+1
| * | l 3 go: activate redis via mkDefaultlassulus2015-11-131-0/+5
| * | l 2 configs: use krebs.per-userlassulus2015-11-131-5/+1
| * | l 2 git: get secrets the new waylassulus2015-11-131-1/+1
| * | l 2 git: adapt to new lib architecturelassulus2015-11-131-1/+1