summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* m 2 elchos: update irc-tokenmakefu2016-12-281-6/+21
* Merge remote-tracking branch 'lass/master'makefu2016-12-2823-822/+438
|\
| * l 2 nixpkgs: 435b5f8 -> 819c1ablassulus2016-12-271-2/+2
| * l 1 mors: add graphite_beacon testing codelassulus2016-12-271-0/+131
| * k 5 irc-announce: cd to /tmplassulus2016-12-271-0/+2
| * k 5: move irc-announce to seperate packagelassulus2016-12-272-63/+67
| * l 2 hfos: redirect port 80 to 1080lassulus2016-12-271-2/+2
| * l 1 mors: disable obsolete mongoDBlassulus2016-12-271-4/+0
| * l 2 nixpkgs: 9625cae -> 435b5f8lassulus2016-12-261-1/+1
| * l 2 websites fritz: remove obsolete manageCertslassulus2016-12-261-2/+1
| * l 2 tests secrets: torrent-autfile -> torrent-authlassulus2016-12-262-1/+3
| * l 1 mors: disable skypelassulus2016-12-261-1/+0
| * l 2 websites lassulus: listen cgit also on port 80lassulus2016-12-261-0/+1
| * l 2 nixpkgs: 2a97e14 -> 9625caelassulus2016-12-261-1/+1
| * l 2: add hfos.nixlassulus2016-12-262-0/+34
| * l 3: remove obsolete nginx moduleslassulus2016-12-263-476/+0
| * l 2 websites lassulus: challenge in default dirlassulus2016-12-261-2/+2
| * l 2 websites fritz: remove biostase.delassulus2016-12-261-3/+0
| * l 2 websites domsen: stop serving *.ubikmedia.delassulus2016-12-261-1/+0
| * l 2 downloading: adapt to new apilassulus2016-12-261-3/+2
| * l: krebs.nginx -> services.nginxlassulus2016-12-2610-241/+165
| * l 1 prism: import libvirtlassulus2016-12-261-4/+1
| * l 2 libvirt: add iptables config for NATlassulus2016-12-261-0/+23
| * l 2 libvirt: add lass to libvirtdlassulus2016-12-261-18/+2
| * k 3 realwallpaper: daymap only available via httpslassulus2016-12-261-1/+1
| * k 3 l: make icarus securelassulus2016-12-261-0/+1
| * Merge remote-tracking branch 'gum/master'lassulus2016-12-2523-480/+427
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2016-12-252-1/+19
| |\ \
| * \ \ Merge remote-tracking branch 'gum/master'lassulus2016-12-2310-39/+157
| |\ \ \
| * \ \ \ 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
* | | | | | Merge remote-tracking branch 'tv/master'makefu2016-12-251-0/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | exim: init at 4.88tv2016-12-251-0/+19
* | | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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