summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gum:stockholmmakefu2016-05-0228-76/+470
|\
| * makefu: init taskserver, keep an eye on ↵makefu2016-04-104-1/+66
| | | | | | | | https://github.com/NixOS/nixpkgs/pull/14476
| * ma 5 taskserver: initmakefu2016-04-082-0/+44
| | | | | | | | will be removed when #14506 is in upstream
| * Merge remote-tracking branch 'cd/master'makefu2016-04-071-4/+10
| |\
| | * Merge remote-tracking branch 'gum/master'tv2016-04-0746-172/+683
| | |\
| | * | addr4: str -> mkOptionTypetv2016-04-071-4/+10
| | | |
| * | | Merge remote-tracking branch 'cd/master'makefu2016-04-071-2/+2
| |\| | | | |/ | |/|
| | * exim: 4.86.2 -> 4.87tv2016-04-071-2/+2
| | |
| * | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-04-075-4/+215
| |\ \
| | * | Merge remote-tracking branch 'cd/master'makefu2016-04-032-1/+177
| | |\|
| | | * tv: import mutv2016-03-312-1/+177
| | | |
| | * | ma 4 default: prepare backupsmakefu2016-04-031-0/+30
| | | |
| | * | ma 2 mail: use mutt, not mutt-kzmakefu2016-04-031-1/+1
| | | |
| | * | ma 1 omo: cleanupmakefu2016-04-031-2/+7
| | | |
| * | | k 3 makefu: add senderechnermakefu2016-04-071-0/+23
| |/ /
| * | ma 2 nginx/public_html: publish homemakefu2016-04-031-0/+15
| | |
| * | ma 1 vbob: remove obsolete sourcemakefu2016-04-031-5/+0
| | |
| * | ma 2 base-gui: save more linesmakefu2016-04-031-11/+3
| | |
| * | ma 2 tp-x220: start charging at 95makefu2016-04-031-0/+1
| | | | | | | | | | | | my thinkpad never fills 100%
| * | ma 1 darth: add virtualizationmakefu2016-04-031-4/+16
| | |
| * | ma 5 mycube: use new versionmakefu2016-04-031-2/+2
| | |
| * | ma 2 omo: share emumakefu2016-04-031-0/+7
| | |
| * | ma 2 fs: use list of strings for optionsmakefu2016-04-012-3/+3
| | |
| * | Merge remote-tracking branch 'prism/master'makefu2016-03-208-45/+63
| |\ \
| | * | Merge remote-tracking branch 'cd/master'lassulus2016-03-191-2/+2
| | |\|
| | | * {nukular,darth}: fix addrs6tv2016-03-171-2/+2
| | | |
| | * | l 3 *_nginx: remove obsolete ssl optionlassulus2016-03-192-42/+2
| | | |
| | * | l 2 baseX: add mpv-poll + depslassulus2016-03-191-1/+3
| | | |
| | * | l 5: add mpv-polllassulus2016-03-192-0/+41
| | | |
| | * | l 5: add yt-nextlassulus2016-03-192-0/+14
| | | |
| | * | k 3 l: add fastpoke pubkeylassulus2016-03-191-0/+1
| | | |
* | | | ma 1 vbob: cleanupmakefu2016-05-021-10/+16
| | | |
* | | | ma 5 devpi: initmakefu2016-05-022-0/+71
|/ / /
* | | k 3 ma: update to `real` tinc pubkeymakefu2016-03-191-12/+7
| | |
* | | ma 1 add more nginxmakefu2016-03-192-4/+9
|/ /
* | k 3 l: add lass.pgp.pubkeys.defaultlassulus2016-03-162-0/+53
| |
* | Merge remote-tracking branch 'gum/master'lassulus2016-03-1614-40/+352
|\ \
| * | ma 1 omo: fix misleading commentmakefu2016-03-161-1/+3
| | |
| * | ma 1 gum: allow vbob and omo usersmakefu2016-03-161-0/+6
| | |
| * | ma 1 darth: configure aux diskmakefu2016-03-161-3/+25
| | |
| * | ma 2 default: really do use tinc_premakefu2016-03-161-0/+1
| | |
| * | k 3 ma: expose pgp pubkeysmakefu2016-03-161-3/+5
| | |
| * | Merge remote-tracking branch 'cd/master'makefu2016-03-167-27/+175
| |\|
| | * krebs types += tinc-pubkeytv2016-03-161-1/+3
| | |
| | * krebs types += pgp-pubkey, user.pgp.pubkeytv2016-03-162-1/+14
| | |
| | * krebs types += ssh-{priv,pub}keytv2016-03-161-21/+23
| | |
| | * krebs lib += getAttrDeftv2016-03-161-0/+1
| | |
| | * krebs types.host.ssh.pubkeys: trace only own missing keystv2016-03-161-4/+4
| | |
| | * krebs lib += optionalTracetv2016-03-161-1/+3
| | |
| | * krebs.users.tv.pgp.pubkey: 2CAEE3B5tv2016-03-161-0/+29
| | |