summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* k 3 l: make icarus securelassulus2016-12-261-0/+1
|
* Merge remote-tracking branch 'gum/master'lassulus2016-12-2523-480/+427
|\
| * m 1 shoney: update to new tinc_stats api, reject externalmakefu2016-12-251-3/+8
| |
| * m 1 wry: forbid external paste accessmakefu2016-12-251-6/+6
| |
| * Merge remote-tracking branch 'lass/master'makefu2016-12-2512-9/+114
| |\
| * | 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
| |\ \
| * | | m 2 default: f52eaf4 -> ee13b9afmakefu2016-12-241-1/+1
| | | |
* | | | Merge remote-tracking branch 'ni/master'lassulus2016-12-252-1/+19
|\ \ \ \
| * | | | exim: init at 4.88tv2016-12-251-0/+19
| | |/ / | |/| |
| * | | 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
| | | |
* | | | 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
| | | | | | | | | | | | | | | | this will break compatibility with krebs.nginx for rutorrent and rtorrent-web
| * | | 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 recommendationstv2016-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
| | | |