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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'lass/master'	makefu	2017-01-05	12	-109/+42
\|\
\| *	l 2 games: add 32bit support for pulseaudio	lassulus	2017-01-02	1	-0/+2
\| *	l 2 baseX: remove pulse.nix and use pulseaudio	lassulus	2017-01-02	2	-97/+6
\| *	l: add & import makefu-sip config	lassulus	2016-12-29	2	-0/+22
\| *	l 2 websites fritz: also enable nginx	lassulus	2016-12-29	1	-0/+3
\| *	l 2: add icarus to authorizedKeys	lassulus	2016-12-29	1	-0/+2
\| *	l 1 mors: remove obsolete powertop activations	lassulus	2016-12-29	1	-4/+0
\| *	l 1 icarus: import games	lassulus	2016-12-29	1	-0/+1
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2016-12-29	2	-9/+77
\| \|\
\| * \	Merge remote-tracking branch 'ni/master'	lassulus	2016-12-28	2	-8/+2
\| \|\ \
\| \| * \|	shared: don't define test aliases	tv	2016-12-28	1	-4/+0
\| \| * \|	shared: test ip4 addr 10.243.111.111 -> 10.243.73.57	tv	2016-12-28	1	-1/+1
\| \| * \|	irc-announce: mktemp --tmpdir	tv	2016-12-28	1	-1/+1
\| \| * \|	Revert "k 5 irc-announce: cd to /tmp"	tv	2016-12-28	1	-2/+0
\| * \| \|	l 2 tests dummy-secrets: add grafana security	lassulus	2016-12-28	1	-0/+4
\| \|/ /
* \| \|	m 1 fileleech: enable ftp	makefu	2017-01-05	1	-4/+25
* \| \|	m 1 fileleech: post-congress	makefu	2017-01-05	1	-1/+38
\| \|/ \|/\|
* \|	m 2 elchos/stats: trigger for all hosts	makefu	2016-12-28	1	-3/+56
* \|	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