summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2016-12-2512-9/+114
|\
| * 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
* | k 3 bepasty-server: finish krebs.nginx -> servers.nginxmakefu2016-12-252-27/+19
* | m 2 elchos/test/: initmakefu2016-12-241-0/+7
* | m 2 elchos/log: initmakefu2016-12-241-0/+56
* | m 2 omo-share: disable nginx sharingmakefu2016-12-241-32/+6
* | m 2 main-laptop: look up once in a whilemakefu2016-12-241-1/+11
* | m 2 elchos/stats: krebs.nginx -> services.nginxmakefu2016-12-241-53/+33
* | m 2 disable_v6: only soft-disable ipv6makefu2016-12-241-1/+0
* | m 1 wry: krebs.nginx -> services.nginxmakefu2016-12-241-9/+12
* | m 1 gum: enable ipv6 (for nginx), krebs.nginx -> services.nginxmakefu2016-12-241-6/+4
* | m 1 fileleech: mount crypt-disksmakefu2016-12-241-22/+106
* | m 1 omo: be more permissive with mergerfsmakefu2016-12-241-3/+8
* | k 3 tinc_graphs: krebs.nginx -> services.nginxmakefu2016-12-241-43/+32
* | k 3 bepasty-server: krebs.nginx -> services.nginxmakefu2016-12-241-11/+19
* | m 2 *: krebs.nginx -> services.nginxmakefu2016-12-249-272/+109
* | 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