summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | by setting infesting for populate, data will be written to /mnt instead of root.
| * | 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
| | |
| * | k 5 Reaktor: init plugin infrastructuremakefu2015-12-253-0/+46
| | |
| * | m 1 gum: enable urlwatch servicemakefu2015-12-242-3/+3
| | |
| * | m 2 urlwatch: add cvs2svn to watchlistmakefu2015-12-241-1/+1
| | |
| * | s 2 buildbot: add treestabletimermakefu2015-12-242-3/+6
| | |
| * | k 5 cacpanel: bump version to 0.2.3makefu2015-12-242-4/+4
| | |
* | | Merge remote-tracking branch 'cd/master'lassulus2015-12-2629-92/+82
|\ \ \ | | |/ | |/|
| * | {pkgs => lib}.genidtv2015-12-2630-93/+83
| | |
* | | l 1 mors: add wordpress/owncloud testlassulus2015-12-261-5/+31
| | |
* | | Merge remote-tracking branch 'gum/master'lassulus2015-12-2421-299/+708
|\ \ \ | | |/ | |/|
| * | k 5 test/infest*: up limit of final connectmakefu2015-12-241-1/+1
| | |
| * | k 3 buildbot.master: refactormakefu2015-12-242-131/+317
| | | | | | | | | | | | see buildbot-standalone.nix in shared/2configs for the current buildbot config
| * | k 3 buildbot: add rsync as explicit depmakefu2015-12-231-6/+11
| | | | | | | | | | | | do not be pure yet
| * | k 3 buildbot/master: send sigterm before sigkill for cleanupmakefu2015-12-231-2/+4
| | |
| * | k 3 buildbot: fix merge fuckupmakefu2015-12-231-5/+0
| | |
| * | Merge remote-tracking branch 'cd/master'makefu2015-12-231-1/+6
| |\|
| | * tv wu: services.bitlbee.plugins += fbtv2015-12-231-1/+6
| | |
| * | k 5 test/infest*: remove batch mode from cac ssh callmakefu2015-12-231-1/+0
| | | | | | | | | | | | this leads to "permission denied"