summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2016-01-1716-43/+188
|\
| * ma 2 default: whitelist unrar from unfreemakefu2016-01-171-1/+1
| * ma 2 vim: disable youcompleteme, install breaksmakefu2016-01-171-1/+1
| * ma 1 omo: bump to unstable@2016-01-13makefu2016-01-171-0/+1
| * ma 2 smart-monitor: disable autodetectionmakefu2016-01-172-1/+5
| * k 5 krebszones: add todo/docmakefu2016-01-171-0/+5
| * Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-01-161-36/+28
| |\
| * | ma 2 default: useroaming no, omo: provide sharemakefu2016-01-163-3/+42
| * | ma 1 minimal: cosmeticsmakefu2016-01-141-1/+1
| * | ma 3 umts: initmakefu2016-01-144-31/+87
| * | ma 1 omo: use sftp sharemakefu2016-01-143-3/+26
| * | ma 2 virtualization: add firewall exception for checkReversePathmakefu2016-01-141-0/+1
| * | ma 2 zsh-user: compinit is being automaticallymakefu2016-01-132-2/+8
| * | ma 1 omo: add sabnzbd;makefu2016-01-081-2/+12
* | | l 1 mors: activate buildbotlassulus2016-01-171-0/+1
* | | l 2 git: add miefda to allowed userslassulus2016-01-171-1/+1
* | | l 2 base: CVE-2016-0778 workaroundlassulus2016-01-171-0/+6
* | | l 2 base: nixpkgs rev 93d8671 -> d0e3ccalassulus2016-01-171-1/+1
* | | l 1 uriel: activate skypelassulus2016-01-171-0/+1
* | | Merge remote-tracking branch 'gum/master'lassulus2016-01-1012-105/+267
|\ \ \ | | |/ | |/|
| * | ma 1 pnp: be able to build as vmmakefu2016-01-071-36/+28
| |/
| * s 2 buildbot: up cac timeout to 3hmakefu2016-01-071-1/+1
| * ma 2 mail-client: put imapfilter,gnupg into the loopmakefu2016-01-051-0/+2
| * ma 3 snapraid: init, configuration for omomakefu2016-01-053-5/+150
| * k 5 snapraid: is part of upstreammakefu2016-01-052-54/+28
| * m 1 omo: act as mail clientmakefu2016-01-031-0/+1
| * ma 2 smartd: enable exim-retiolum by defaultmakefu2016-01-031-2/+3
| * ma 2 default: bump nixpkgs revision to unstablemakefu2016-01-031-2/+2
| * ma 1 filepimp: prepare raidmakefu2016-01-031-4/+11
| * ma 1 omo: actually build the hostmakefu2016-01-031-8/+40
| * k 5 test/infest-cac-centos7: add timeouts, error handlingmakefu2016-01-021-5/+13
| * ma 1 filepimp: add missing kernel modulesmakefu2016-01-021-5/+5
| * k default: root path for populatemakefu2016-01-021-5/+4
| * s 2 buildbot: add short tree timeout before trying a testmakefu2015-12-301-0/+1
* | 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