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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ni/master'	lassulus	2017-01-09	5	-28/+15
\|\
\| *	krebs.git: add authorizedKeys only for users found in rules	tv	2017-01-07	1	-3/+5
\| *	alnus nixpkgs: d745044 -> e924319	tv	2017-01-07	1	-5/+1
\| *	tv: use body instead of out	tv	2017-01-05	3	-20/+9
* \|	l 2 websites domsen: add ubikmedia subdomains	lassulus	2017-01-09	1	-0/+8
* \|	l 2 websites domsen: remove obsolete ssl function	lassulus	2017-01-09	1	-32/+0
* \|	l 2 hfos: forward smtp	lassulus	2017-01-09	1	-0/+2
* \|	l 1 shodan: reinstall with btrfs	lassulus	2017-01-09	1	-6/+2
* \|	l 3: add kapacitor service	lassulus	2017-01-09	2	-0/+102
* \|	l 3: add telegraf service	lassulus	2017-01-09	2	-0/+68
* \|	k 5: add kapacitor	lassulus	2017-01-09	1	-0/+23
* \|	k 5: add telegraf	lassulus	2017-01-09	2	-0/+615
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-01-05	1	-2/+60
\|\ \ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'lass/master'	makefu	2017-01-05	12	-109/+42
\| \|\
\| * \|	m 1 fileleech: enable ftp	makefu	2017-01-05	1	-4/+25
\| * \|	m 1 fileleech: post-congress	makefu	2017-01-05	1	-1/+38
* \| \|	Merge remote-tracking branch 'prism/lassulus'	tv	2017-01-05	12	-110/+117
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	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
\| \|\\|
\| \| *	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
\| \| \|\
\| \| * \	Merge remote-tracking branch 'tv/master'	makefu	2016-12-25	1	-0/+19
\| \| \|\ \
\| * \| \ \	Merge remote-tracking branch 'ni/master'	lassulus	2016-12-28	2	-8/+2
\| \|\ \ \ \
\| * \| \| \| \|	l 2 tests dummy-secrets: add grafana security	lassulus	2016-12-28	1	-0/+4
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	tv backup: drop *-pull-cd-ejabberd	tv	2017-01-04	1	-12/+0
* \| \| \| \|	cd: hart eingeCACt	tv	2017-01-04	2	-3/+3
* \| \| \| \|	infest/prepare: touch /mnt/var/src/.populate	tv	2017-01-04	1	-0/+2
* \| \| \| \|	infest/prepare: fix style inconsistencies	tv	2017-01-04	1	-4/+4
\| \|/ / / \|/\| \| \|
* \| \| \|	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 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