summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'gum/master'lassulus2016-12-2310-39/+157
|\
| * 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
| |\
| * | k 5 rutorrent: bump revmakefu2016-12-131-3/+3
| * | m 2 irc-token: initmakefu2016-12-121-0/+62
* | | Merge remote-tracking branch 'ni/master'lassulus2016-12-237-321/+47
|\ \ \
| * | | tv nginx: enable recommendationsmaster-1tv2016-12-231-0/+4
| * | | tv nginx: return 404 by defaulttv2016-12-231-0/+7
| * | | tv: replace krebs.nginx by services.nginx.virtualHoststv2016-12-233-19/+17
| * | | tv: RIP xu-qemu0tv2016-12-232-278/+0
| * | | cgit service: use services.nginx.virtualHoststv2016-12-231-23/+18
| * | | tv nixpkgs: 1dd0fb6 -> 5d03aabtv2016-12-231-1/+1
* | | | l 2 zsh: set default shell of mainUserlassulus2016-12-221-0/+1
* | | | l 1 prism: add lass to libvirtd grouplassulus2016-12-221-0/+1
* | | | l 2 power-action: lower batter-warning limitlassulus2016-12-221-2/+2
* | | | l 1 mors: expose public_html to LANlassulus2016-12-221-5/+13
* | | | k 3 l: add cgit.mors.rlassulus2016-12-221-0/+1
* | | | l 2 weechat: add icarus to authorized_keyslassulus2016-12-221-0/+1
* | | | l 2 git: uriel -> shodanlassulus2016-12-221-1/+1
* | | | l 2 builbot: add icarus to test-hostslassulus2016-12-221-1/+1
* | | | l 1: add icaruslassulus2016-12-221-0/+59
* | | | k 3 l: add icaruslassulus2016-12-222-0/+32
* | | | l 2: add lass to audio grouplassulus2016-12-221-0/+1
* | | | l 1 helios: enable pulseaudio systemWidelassulus2016-12-221-0/+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
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'ni/master'lassulus2016-12-203-7/+19
| |\ \
| * | | 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
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'lass/master'makefu2016-12-129-37/+106
| | |\ \
| | * | | m 2 default: bump revisionmakefu2016-12-121-2/+1
| | * | | m 5 tw-upload-plugin: updatemakefu2016-12-071-2/+2
| | * | | m 5 acdcli: initmakefu2016-12-062-0/+21
| * | | | 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
| | |/ / | |/| |
| * | | 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