summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2016-02-013-9/+17
|\
| * Merge branch 'fix-cert': adds cac panel certmakefu2016-01-290-0/+0
| |\
| | * Merge branch 'master' of gum:stockholm into fix-certmakefu2016-01-290-0/+0
| | |\ | | |/ | |/|
| * | s 1 wolf: add grafana servicemakefu2016-01-231-1/+12
| | * s 1 wolf: add grafana servicemakefu2016-01-231-1/+12
| | * Merge branch 'master' of gum:stockholm into fix-certmakefu2016-01-221-0/+2
| | |\ | | |/ | |/|
| * | s 2 buildbot: add show-tracemakefu2016-01-191-0/+2
| * | s 2 base: use current unstablemakefu2016-01-192-8/+3
| | * s 2 base: use current unstablemakefu2016-01-182-8/+3
| |/
* | Merge remote-tracking branch 'cd/master'lassulus2016-02-0110-23/+145
|\ \
| * | tv config: isUser root == truetv2016-02-011-1/+2
| * | xu: use upstream lentiltv2016-02-011-1/+1
| * | make {deploy,infest}: fail when make eval failstv2016-02-011-1/+2
| * | make deploy2: deploy using nixos-rebuild switchtv2016-02-016-19/+108
| * | tv nixpkgs: b7ff030 -> 77f8f35tv2016-01-281-1/+1
| * | tv ejabberd: init at 2.1.13tv2016-01-182-0/+31
| * | lentil: RIP; upstream is good enoughtv2016-01-171-1/+1
* | | Merge remote-tracking branch 'cd/master'lassulus2016-01-175-16/+30
|\| |
| * | tv vim hs syn region String start: bumptv2016-01-141-1/+1
| * | Merge remote-tracking branch 'gum/master'tv2016-01-1411-21/+235
| |\ \
| * | | tv ssh_config: UseRoaming=notv2016-01-141-1/+6
| * | | tv nixpkgs: c44a593 -> b7ff030tv2016-01-141-1/+1
| * | | nomic: use pulse and xservertv2016-01-141-0/+2
| * | | tv: install pavucontrol only when xserver is enabledtv2016-01-142-2/+5
| * | | tv pulse: explain pulseaudio-hacktv2016-01-141-6/+9
| * | | tv pulse: lol tmpfilestv2016-01-141-5/+6
* | | | Merge remote-tracking branch 'gum/master'lassulus2016-01-171-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | ma 1 minimal: cosmeticsmakefu2016-01-141-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'gum/master'lassulus2016-01-101-1/+2
|\| |
| * | s 2 buildbot: up cac timeout to 3hmakefu2016-01-071-1/+1
| * | s 2 buildbot: add short tree timeout before trying a testmakefu2015-12-301-0/+1
* | | Merge remote-tracking branch 'cd/master'lassulus2016-01-101-32/+8
|\ \ \ | | |/ | |/|
| * | tv backup: wu:/home → xu:/bku/wu-home @ 05:00tv2016-01-051-13/+10
| * | krebs.backup.plans.*.{snapshots,startAt} += defaulttv2016-01-051-21/+0
* | | Merge remote-tracking branch 'bobby/master'lassulus2015-12-300-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'prism/master'miefda2015-12-3015-263/+263
| |\ \ \ | | | |/ | | |/|
* | / | Merge remote-tracking branch 'bobby/master'lassulus2015-12-308-0/+288
|\| | | | |/ / |/| |
| * | mi 2 git: bobby now verbosemiefda2015-12-301-1/+1
| * | miefda: init with bobbymiefda2015-12-308-0/+288
* | | s 1 minimal-deploy: init testmakefu2015-12-302-0/+24
* | | s 2 buildbot-standalone: cosmeticsmakefu2015-12-301-5/+6
* | | s 1 test-all-krebs-modules: initmakefu2015-12-302-4/+58
* | | m 3 buildbot/master: add secretsmakefu2015-12-301-3/+5
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-294-6/+73
|\ \ \
| * \ \ Merge remote-tracking branch 'cd/master'makefu2015-12-284-6/+73
| |\ \ \ | | | |/ | | |/|
| | * | {tv 2 => krebs 3} backuptv2015-12-284-242/+29
| | |/
| | * tv backup: initial committv2015-12-283-0/+256
| | * tv: disable display-managertv2015-12-271-1/+1
| | * tv vim: ensure relevant dirs existtv2015-12-271-5/+29
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-266-13/+9
| |\|