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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-06-02	13	-136/+243
\|\
\| *	k 2 steam.nix: init	makefu	2016-06-02	1	-0/+6
\| *	ma 2 exim-retiolum: add firewall exception for exim-retiolum	makefu	2016-06-02	1	-1/+2
\| *	ma 1 pornocauster: cleanup	makefu	2016-06-02	1	-8/+22
\| *	k 3 ma: fix addrs4 for tpsw	makefu	2016-06-02	1	-2/+2
\| *	m 2 default:use stable branch	makefu	2016-06-02	1	-2/+3
\| *	Merge remote-tracking branch 'cd/master'	makefu	2016-06-02	2	-118/+113
\| \|\
\| \| *	tv ff: use abspath to sudo	tv	2016-05-25	2	-4/+8
\| \| *	tv xserver: replace need-reload by echo	tv	2016-05-25	2	-3/+2
\| \| *	tv xserver: normalize syslog identifiers	tv	2016-05-25	1	-0/+3
\| \| *	tv xserver: log to journal instead of file	tv	2016-05-25	1	-2/+1
\| \| *	tv xserver: refactor	tv	2016-05-25	2	-115/+105
\| * \|	Merge remote-tracking branch 'prism/master'	makefu	2016-06-02	26	-441/+608
\| \|\ \
\| * \| \|	add init stockholm	makefu	2016-06-02	1	-0/+3
\| * \| \|	Merge remote-tracking branch 'cd/master'	makefu	2016-05-24	1	-1/+3
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'cloudkrebs/master'	makefu	2016-05-24	58	-632/+1661
\| \|\ \ \ \
\| * \ \ \ \	merge cd/master	makefu	2016-05-24	43	-426/+511
\| \|\ \ \ \ \
\| * \| \| \| \| \|	ma 2 omo-share: simply export crypt devices	makefu	2016-05-24	1	-4/+4
\| * \| \| \| \| \|	ma 2 temp-share: init	makefu	2016-05-24	1	-0/+28
\| * \| \| \| \| \|	add skytraq-logger	makefu	2016-05-24	3	-0/+33
\| * \| \| \| \| \|	k 3 makefu: add tpsw, owned by ciko	makefu	2016-05-16	1	-6/+29
* \| \| \| \| \| \|	l 2 baseX: add lm_sensors to pkgs	lassulus	2016-06-02	1	-1/+2
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	k 5: disable buildbot override	lassulus	2016-06-01	1	-7/+7
* \| \| \| \| \|	l 2 websites util: add server-names to manageCerts	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	l 2 websites: put sqlBackup in seperate file	lassulus	2016-06-01	3	-70/+69
* \| \| \| \| \|	l 2 exim-smarthost: redirect dominik@apanowicz.de	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	l 2 exim-smarthost: add mail for finanzamt	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	l 2: bump nixpkgs e781dae -> f632f8e	lassulus	2016-06-01	1	-1/+1
* \| \| \| \| \|	l 2: add mainUser to fuse for sshfs	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	l 2 browsers: add com browser	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	l 1 mors: add remmina to pkgs	lassulus	2016-06-01	1	-0/+1
* \| \| \| \| \|	k 3 nginx: unique server-names to silence nginx	lassulus	2016-06-01	1	-1/+1
* \| \| \| \| \|	l 1 prism: add cgit for cgit.lassul.us	lassulus	2016-06-01	1	-1/+9
* \| \| \| \| \|	l 1 prism: import buildbot normally	lassulus	2016-05-31	1	-6/+1
* \| \| \| \| \|	l: move websites libs to 2/websites/util	lassulus	2016-05-31	6	-238/+248
* \| \| \| \| \|	k 3 iptables: allow DNAT rules	lassulus	2016-05-29	1	-1/+1
* \| \| \| \| \|	l 2 radio print_current: show youtube link	lassulus	2016-05-25	1	-1/+3
* \| \| \| \| \|	l 2 websites fritz: use ssl everywhere	lassulus	2016-05-25	1	-7/+7
* \| \| \| \| \|	l 2 websites domsen: use old phpIni again	lassulus	2016-05-25	1	-3/+12
* \| \| \| \| \|	l 2 radio: add config for lassul.us/the_playlist	lassulus	2016-05-25	1	-0/+25
* \| \| \| \| \|	l 2 radio: add Reaktor config	lassulus	2016-05-25	1	-0/+19
* \| \| \| \| \|	l 2 radio: add and use utils	lassulus	2016-05-25	1	-5/+21
* \| \| \| \| \|	l 2 git: add the_playlist without announcement	lassulus	2016-05-25	1	-0/+7
* \| \| \| \| \|	l 2: use nixos-16.03 with new ts3 server	lassulus	2016-05-25	1	-2/+2
* \| \| \| \| \|	Merge remote-tracking branch 'cd/master' into HEAD	lassulus	2016-05-25	9	-101/+156
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	tv slock: user krebs.setuid	tv	2016-05-25	1	-4/+10
\| * \| \| \| \|	tv xserver: compress need-reload	tv	2016-05-25	1	-6/+4
\| * \| \| \| \|	tv xmodmap: init	tv	2016-05-25	2	-0/+28
\| * \| \| \| \|	tv xserver: drop wrapper	tv	2016-05-25	1	-13/+9
\| * \| \| \| \|	xmonad-tv: startupHook = $XMONAD_STARTUP_HOOK &	tv	2016-05-25	2	-26/+13