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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 1 prism: change sequence of ip addresses	lassulus	2017-01-10	1	-16/+16
*	l 2 websites fritz: remove obsolete ssl function	lassulus	2017-01-10	1	-9/+0
*	l 2 hfos: update riot pubkey	lassulus	2017-01-10	1	-1/+1
*	l 2 websites domsen: add www.ubikmedia.de	lassulus	2017-01-10	1	-0/+1
*	l 2: add sshuttle config	lassulus	2017-01-10	2	-0/+14
*	l 5 xmonad: add copyq keybinding	lassulus	2017-01-10	1	-0/+2
*	l 2 xserver: add copyq to startup	lassulus	2017-01-10	1	-0/+35
*	Merge remote-tracking branch 'gum/master'	lassulus	2017-01-10	15	-64/+174
\|\
\| *	m 1 wry: add central-stats-client	makefu	2017-01-10	1	-2/+2
\| *	m 2 logging: retab	makefu	2017-01-09	2	-27/+27
\| *	m 3 logging-config: init	makefu	2017-01-09	1	-0/+11
\| *	m 2 nginx/share-download: expose dl-dir via nginx	makefu	2017-01-09	1	-0/+18
\| *	m 2 logging: init	makefu	2017-01-09	2	-0/+96
\| *	m: expose torrent-secrets	makefu	2017-01-09	3	-2/+17
\| *	m 2 omo-share: expose crypt0 read-only	makefu	2017-01-09	1	-0/+6
\| *	m 2 elchos/stats: remove graphite-beacon	makefu	2017-01-09	1	-55/+12
\| *	m 2 elchos/log: do not write to stdout	makefu	2017-01-09	1	-3/+3
\| *	m 2 backup: add gum to backup	makefu	2017-01-09	1	-1/+2
\| *	k 3 rtorrent: always restart	makefu	2017-01-09	1	-1/+2
\| *	k 3 m: gum add subdomains	makefu	2017-01-09	2	-0/+5
* \|	l 2 vim: add flake8 for python style checking	lassulus	2017-01-10	1	-0/+1
* \|	l 2 nixpkgs: 819c1ab -> d98b556	lassulus	2017-01-09	1	-1/+1
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-01-09	2	-0/+425
\|\\|
\| *	m 2 openvpn: add vpngate	makefu	2017-01-08	1	-0/+280
\| *	m 2 deployment: init owncloud	makefu	2017-01-08	1	-0/+145
* \|	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
\| \|\\|