summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'tv/master'makefu2016-12-2410-321/+57
|\
| * tv nginx: enable recommendationstv2016-12-241-0/+4
| * tv nginx: return 404 by defaulttv2016-12-241-0/+7
| * tv: replace krebs.nginx by services.nginx.virtualHoststv2016-12-243-19/+17
| * tv: RIP xu-qemu0tv2016-12-243-279/+0
| * cgit service: use services.nginx.virtualHoststv2016-12-231-23/+18
| * tv nixpkgs: 1dd0fb6 -> 5d03aabtv2016-12-231-1/+1
| * tv public_html: add server namestv2016-12-221-5/+13
| * krebs.backup: shellcheck disable=SC2174tv2016-12-221-0/+3
| * Merge remote-tracking branch 'prism/master'tv2016-12-2213-24/+52
| |\
| * | tv nixpkgs: 81428dd -> 1dd0fb6tv2016-12-221-1/+1
| * | tv netcup: bump rev/sha256tv2016-12-221-2/+2
* | | m 2 default: f52eaf4 -> ee13b9afmakefu2016-12-241-1/+1
* | | m 6 secrets: auth.nix replaces authfilemakefu2016-12-222-1/+3
* | | m 2 torrent: use new krebs.rtorrent apimakefu2016-12-221-4/+3
* | | k 3 rtorrent: krebs.nginx -> services.nginxmakefu2016-12-221-31/+23
* | | m 3 server-config: initmakefu2016-12-224-0/+63
* | | Merge remote-tracking branch 'lass/master'makefu2016-12-217-16/+22
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'ni/master'lassulus2016-12-203-7/+19
| |\|
| | * tv nixpkgs: e360c72 -> 81428ddtv2016-12-161-1/+1
| | * nomic: keep using grubtv2016-12-031-0/+10
| | * zu: define gg23tv2016-12-031-5/+7
| | * nomic: AO753 -> x220tv2016-12-031-1/+1
| | * Merge remote-tracking branch 'prism/master'tv2016-12-018-72/+110
| | |\
| | * | tv nixpkgs: 728a957 -> e360c72tv2016-12-011-1/+1
| * | | l 2 nixpkgs: 953889b -> 2a97e14lassulus2016-12-201-1/+1
| * | | l 2 nixpkgs: 76f346d -> 953889blassulus2016-12-141-1/+1
| * | | Merge remote-tracking branch 'gum/master'lassulus2016-12-124-4/+24
| |\ \ \
| * | | | l 2: remove teamviewerlassulus2016-12-122-7/+0
| * | | | l 1 mors: import ircdlassulus2016-12-121-0/+1
| * | | | l 2 websites domsen: add domsen to download grouplassulus2016-12-121-1/+1
* | | | | k 5 rutorrent: bump revmakefu2016-12-131-3/+3
* | | | | m 2 irc-token: initmakefu2016-12-121-0/+62
| |/ / / |/| | |
* | | | Merge remote-tracking branch 'lass/master'makefu2016-12-129-37/+106
|\| | |
| * | | l 2 exim-smarthost: add irgendwas@lassul.uslassulus2016-12-081-0/+1
| * | | l 2 nixpkgs: 6a9f087 -> 76f346dlassulus2016-12-071-1/+1
| * | | l 2 games: use zandronum-bin instead of zandronumlassulus2016-12-071-1/+1
| * | | l 2 games: add vdoom{1,2} to pkgslassulus2016-12-071-2/+16
| * | | l 2 privoxy-retiolum: open for dns0lassulus2016-12-041-0/+1
| * | | l 2 baseX: add terminals to pkgslassulus2016-12-041-0/+3
| * | | l 2 baseX: use pulse.nixlassulus2016-12-041-4/+1
| * | | l 1 mors: use libvirtd instead of virtualboxlassulus2016-12-041-1/+3
| * | | l 2 nixpkgs: e360c72 -> 6a9f087lassulus2016-12-041-1/+1
| * | | k 5 urlwatch: remove obsolete postFixuplassulus2016-12-021-4/+0
| | |/ | |/|
| * | l 2 nixpkgs: ece0cea -> e360c72lassulus2016-12-011-1/+1
| * | l 2 games: add doom{1,2} wrapperslassulus2016-12-011-0/+18
| * | l 2 baseX: add ncdu to pkgslassulus2016-12-011-0/+1
| * | k 3: remove Mic92 from eloop-mllassulus2016-12-011-2/+1
| * | Merge remote-tracking branch 'gum/master'lassulus2016-11-291-17/+20
| |\ \
| * | | l 2 buildbot: rename build-all -> build-hostslassulus2016-11-291-3/+3