summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'lassulus2016-01-104-36/+33
|\
| * krebs.backup: add TODOstv2016-01-051-0/+12
| * tv backup: wu:/home → xu:/bku/wu-home @ 05:00tv2016-01-052-13/+11
| * krebs.backup.plans.*.{snapshots,startAt} += defaulttv2016-01-052-22/+9
| * get: 1.3.1 -> 1.4.0tv2016-01-051-3/+3
* | Merge remote-tracking branch 'bobby/master'lassulus2015-12-300-0/+0
|\ \
| * \ Merge remote-tracking branch 'prism/master'miefda2015-12-3062-761/+1611
| |\ \
* | | | Merge remote-tracking branch 'bobby/master'lassulus2015-12-3010-0/+329
|\| | | | |/ / |/| |
| * | mi 2 git: bobby now verbosemiefda2015-12-301-1/+1
| * | miefda: init with bobbymiefda2015-12-3011-0/+339
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-306-21/+62
|\ \ \
| * \ \ Merge remote-tracking branch 'cd/master'makefu2015-12-301-11/+9
| |\ \ \ | | | |/ | | |/|
| | * | exim-retiolum: move assert to proper locationtv2015-12-301-11/+9
| * | | s 1 minimal-deploy: init testmakefu2015-12-302-0/+24
| * | | m 1 wry: update Reaktor configmakefu2015-12-301-2/+1
| * | | k 5 Reaktor.plugins: fix sed-pluginmakefu2015-12-301-3/+5
| * | | k 3 Reaktor: add channels Optionmakefu2015-12-302-7/+25
* | | | l: add new host dishfirelassulus2015-12-303-0/+87
* | | | Merge remote-tracking branch 'gum/master'lassulus2015-12-304-9/+66
|\| | |
| * | | k 5 test: fix endless loop in testmakefu2015-12-301-1/+2
| * | | s 2 buildbot-standalone: cosmeticsmakefu2015-12-301-5/+6
| * | | s 1 test-all-krebs-modules: initmakefu2015-12-303-4/+59
* | | | l 2: add buildbot-standalonelassulus2015-12-301-0/+78
* | | | l 2 base: checkout nixpkgs to /var/src/lassulus2015-12-301-0/+1
* | | | Merge remote-tracking branch 'gum/master'lassulus2015-12-306-9/+67
|\| | |
| * | | m 3 buildbot/master: add secretsmakefu2015-12-302-6/+18
| * | | m 2 urlwatch: use py2 instead of py2k urlwatchmakefu2015-12-291-2/+18
| * | | m 1 gum: add smart monitormakefu2015-12-292-1/+20
| * | | k 3 makefu: add ssh pubkeys to hostsmakefu2015-12-291-0/+11
* | | | l 2 baseX: add pkgs.dmenulassulus2015-12-291-0/+1
|/ / /
* | | k hosts: add kebscolassulus2015-12-291-0/+11
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-2926-241/+569
|\ \ \
| * | | k Zhosts: init bobby (miefda)makefu2015-12-291-0/+11
| * | | Merge remote-tracking branch 'cd/master'makefu2015-12-287-6/+377
| |\| |
| | * | {tv 2 => krebs 3} backuptv2015-12-287-242/+333
| | |/
| | * 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
| * | m 2 urlwatch: replace url for cvs2svnmakefu2015-12-281-1/+1
| * | k 5 test/infest-cac-centos7: use defer, loop until we get a working cac boxmakefu2015-12-281-26/+51
| * | k 5 default: populate supports infesting argmakefu2015-12-281-6/+15
| * | m 3 Reaktor: now supports plugin infra see m/1/pornocaustermakefu2015-12-263-9/+13
| * | k 5 ReaktorPlugins: hotfix for env generationmakefu2015-12-261-1/+1
| * | k 5 Reaktor/plugins: converted plugins from makefu/2/Reaktormakefu2015-12-2612-194/+102
| * | m 3 buildbot/master: use genidmakefu2015-12-261-1/+1
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-2629-92/+82
| |\|
* | | l 5 newsbot-js: rev 6ee4884 -> 802b172lassulus2015-12-261-2/+2
* | | l 2: move pkgs from xserver to baseXlassulus2015-12-262-16/+7
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-2611-12/+70
|\| |
| * | m 3 Reaktor: add workdir/state_dirmakefu2015-12-261-1/+10