summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* k 3 l: remove dead hostslassulus2016-02-011-16/+0
* Merge remote-tracking branch 'gum/master'lassulus2016-02-0117-32/+231
|\
| * k 5/test/infest-cac: add ca-bundle for pythonmakefu2016-01-291-1/+2
| * Merge branch 'fix-cert': adds cac panel certmakefu2016-01-292-1/+90
| |\
| | * Merge branch 'master' of gum:stockholm into fix-certgum/fix-certmakefu2016-01-292-6/+39
| | |\ | | |/ | |/|
| * | ma 1 omo: cleanup, fix firewallingmakefu2016-01-271-18/+11
| * | ma 1 omo: add samba sharemakefu2016-01-271-5/+44
| * | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-01-232-2/+13
| |\ \
| | * | s 1 wolf: add grafana servicemakefu2016-01-231-1/+12
| | * | Merge branch 'master' of gum:stockholmmakefu2016-01-2317-27/+87
| | |\ \
| * | | | ma 2 urlwatch: add acngmakefu2016-01-231-0/+1
| | |/ / | |/| |
| | | * s 1 wolf: add grafana servicemakefu2016-01-231-1/+12
| | | * Merge branch 'master' of gum:stockholm into fix-certmakefu2016-01-227-3/+60
| | | |\ | | |_|/ | |/| |
| * | | k 5 acng: bump to 0.8.8makefu2016-01-191-2/+2
| * | | s 2 buildbot: add show-tracemakefu2016-01-191-0/+2
| * | | makefu: init wbobmakefu2016-01-193-0/+53
| * | | s 2 base: use current unstablemakefu2016-01-192-8/+3
| * | | ma 1 vbob: remove unstablemakefu2016-01-191-9/+10
| * | | k 5 forticlientsslvpn: fix licensemakefu2016-01-191-1/+1
| * | | ma 5 awesomecfg/full: remove volume fieldmakefu2016-01-191-3/+0
| * | | ma 2 tinc-basic-retiolum: remove obsolete hosts path - corresponds with defaultsmakefu2016-01-191-1/+0
| * | | ma 2 git/cgit: add init-stockholm repomakefu2016-01-191-0/+3
| | | * k 5 cac: temporarily disable tasks from updatemakefu2016-01-182-1/+12
| | | * Merge remote-tracking branch 'gum/fix-cert' into fix-certmakefu2016-01-1813-25/+117
| | |/|
| | | * k 5 test: add cac panel crtmakefu2016-01-182-1/+90
| | | * s 2 base: use current unstablemakefu2016-01-182-8/+3
| | | * ma 1 vbob: remove unstablemakefu2016-01-181-9/+10
| | | * k 5 forticlientsslvpn: fix licensemakefu2016-01-181-1/+1
| | | * Merge branch 'master' of gum:stockholmmakefu2016-01-1895-774/+1896
| | | |\ | | |_|/ | |/| |
| | | * ma 5 awesomecfg/full: remove volume fieldmakefu2016-01-131-3/+0
| | * | Merge branch 'master' of gum:stockholmmakefu2016-01-1613-40/+175
| | |\ \
| | * | | k 5 lentil: haskellng -> haskellmakefu2016-01-161-1/+1
* | | | | Merge remote-tracking branch 'cd/master'lassulus2016-02-0119-92/+425
|\ \ \ \ \
| * | | | | krebs/populate.nix: chmod 0755 "$tmpdir"tv2016-02-011-0/+1
| * | | | | tv config: isUser root == truetv2016-02-011-1/+2
| * | | | | krebs.populate: disable copy-links, owner, and grouptv2016-02-011-1/+1
| * | | | | xu: use upstream lentiltv2016-02-011-1/+1
| * | | | | much: use haskellPackagestv2016-02-011-1/+1
| * | | | | make {deploy,infest}: fail when make eval failstv2016-02-011-1/+2
| * | | | | make deploy2: deploy using nixos-rebuild switchtv2016-02-0110-58/+302
| * | | | | tv nixpkgs: b7ff030 -> 77f8f35tv2016-01-281-1/+1
| * | | | | tv ejabberd: init at 2.1.13tv2016-01-182-0/+31
| * | | | | krebs.urlwatch: bump compatibility to urlwatch-2tv2016-01-171-2/+44
| * | | | | urlwatch: init at 2.0tv2016-01-171-0/+39
| * | | | | lentil: RIP; upstream is good enoughtv2016-01-173-27/+1
* | | | | | l 2 bitcoin: add sudo configlassulus2016-01-191-1/+6
* | | | | | Merge remote-tracking branch 'cd/master'lassulus2016-01-176-20/+30
|\| | | | |
| * | | | | tv vim hs syn region String start: bumptv2016-01-141-1/+1
| * | | | | Merge remote-tracking branch 'gum/master'tv2016-01-1456-599/+1365
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | tv ssh_config: UseRoaming=notv2016-01-141-1/+6