stockholm - take all the computers hostage, they'll love you!

	Commit message (Expand)	Author	Age	Files	Lines
*	m 2 elchos: update irc-token	makefu	2016-12-28	1	-6/+21
*	Merge remote-tracking branch 'lass/master'	makefu	2016-12-28	23	-822/+438
\|\
\| *	l 2 nixpkgs: 435b5f8 -> 819c1ab	lassulus	2016-12-27	1	-2/+2
\| *	l 1 mors: add graphite_beacon testing code	lassulus	2016-12-27	1	-0/+131
\| *	k 5 irc-announce: cd to /tmp	lassulus	2016-12-27	1	-0/+2
\| *	k 5: move irc-announce to seperate package	lassulus	2016-12-27	2	-63/+67
\| *	l 2 hfos: redirect port 80 to 1080	lassulus	2016-12-27	1	-2/+2
\| *	l 1 mors: disable obsolete mongoDB	lassulus	2016-12-27	1	-4/+0
\| *	l 2 nixpkgs: 9625cae -> 435b5f8	lassulus	2016-12-26	1	-1/+1
\| *	l 2 websites fritz: remove obsolete manageCerts	lassulus	2016-12-26	1	-2/+1
\| *	l 2 tests secrets: torrent-autfile -> torrent-auth	lassulus	2016-12-26	2	-1/+3
\| *	l 1 mors: disable skype	lassulus	2016-12-26	1	-1/+0
\| *	l 2 websites lassulus: listen cgit also on port 80	lassulus	2016-12-26	1	-0/+1
\| *	l 2 nixpkgs: 2a97e14 -> 9625cae	lassulus	2016-12-26	1	-1/+1
\| *	l 2: add hfos.nix	lassulus	2016-12-26	2	-0/+34
\| *	l 3: remove obsolete nginx modules	lassulus	2016-12-26	3	-476/+0
\| *	l 2 websites lassulus: challenge in default dir	lassulus	2016-12-26	1	-2/+2
\| *	l 2 websites fritz: remove biostase.de	lassulus	2016-12-26	1	-3/+0
\| *	l 2 websites domsen: stop serving *.ubikmedia.de	lassulus	2016-12-26	1	-1/+0
\| *	l 2 downloading: adapt to new api	lassulus	2016-12-26	1	-3/+2
\| *	l: krebs.nginx -> services.nginx	lassulus	2016-12-26	10	-241/+165
\| *	l 1 prism: import libvirt	lassulus	2016-12-26	1	-4/+1
\| *	l 2 libvirt: add iptables config for NAT	lassulus	2016-12-26	1	-0/+23
\| *	l 2 libvirt: add lass to libvirtd	lassulus	2016-12-26	1	-18/+2
\| *	k 3 realwallpaper: daymap only available via https	lassulus	2016-12-26	1	-1/+1
\| *	k 3 l: make icarus secure	lassulus	2016-12-26	1	-0/+1
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2016-12-25	23	-480/+427
\| \|\
\| * \	Merge remote-tracking branch 'ni/master'	lassulus	2016-12-25	2	-1/+19
\| \|\ \
\| * \ \	Merge remote-tracking branch 'gum/master'	lassulus	2016-12-23	10	-39/+157
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'ni/master'	lassulus	2016-12-23	7	-321/+47
\| \|\ \ \ \
\| \| * \| \| \|	tv nginx: enable recommendations	tv	2016-12-23	1	-0/+4
\| \| * \| \| \|	tv nginx: return 404 by default	tv	2016-12-23	1	-0/+7
\| \| * \| \| \|	tv: replace krebs.nginx by services.nginx.virtualHosts	tv	2016-12-23	3	-19/+17
\| \| * \| \| \|	tv: RIP xu-qemu0	tv	2016-12-23	2	-278/+0
* \| \| \| \| \|	Merge remote-tracking branch 'tv/master'	makefu	2016-12-25	1	-0/+19
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	exim: init at 4.88	tv	2016-12-25	1	-0/+19
* \| \| \| \|	m 1 shoney: update to new tinc_stats api, reject external	makefu	2016-12-25	1	-3/+8
* \| \| \| \|	m 1 wry: forbid external paste access	makefu	2016-12-25	1	-6/+6
* \| \| \| \|	Merge remote-tracking branch 'lass/master'	makefu	2016-12-25	12	-9/+114
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	l 2 zsh: set default shell of mainUser	lassulus	2016-12-22	1	-0/+1
\| * \| \| \|	l 1 prism: add lass to libvirtd group	lassulus	2016-12-22	1	-0/+1
\| * \| \| \|	l 2 power-action: lower batter-warning limit	lassulus	2016-12-22	1	-2/+2
\| * \| \| \|	l 1 mors: expose public_html to LAN	lassulus	2016-12-22	1	-5/+13
\| * \| \| \|	k 3 l: add cgit.mors.r	lassulus	2016-12-22	1	-0/+1
\| * \| \| \|	l 2 weechat: add icarus to authorized_keys	lassulus	2016-12-22	1	-0/+1
\| * \| \| \|	l 2 git: uriel -> shodan	lassulus	2016-12-22	1	-1/+1
\| * \| \| \|	l 2 builbot: add icarus to test-hosts	lassulus	2016-12-22	1	-1/+1
\| * \| \| \|	l 1: add icarus	lassulus	2016-12-22	1	-0/+59
\| * \| \| \|	k 3 l: add icarus	lassulus	2016-12-22	2	-0/+32
\| * \| \| \|	l 2: add lass to audio group	lassulus	2016-12-22	1	-0/+1