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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 2 buildbot: use prism.r	lassulus	2017-04-12	1	-0/+3
*	mv: drop .retiolum	tv	2017-04-12	1	-2/+0
*	tv charybdis: irc.retiolum -> irc.r	tv	2017-04-12	1	-1/+1
*	tv nginx public_html: drop .retiolum	tv	2017-04-12	1	-1/+0
*	shared collectd-base: .retiolum -> .r	tv	2017-04-12	1	-1/+1
*	krebs.urlwatch: .retiolum -> .r	tv	2017-04-12	1	-1/+1
*	shared: .retiolum -> .r	tv	2017-04-12	1	-2/+2
*	krebs.exim-* relay_to_domains: drop .retiolum from default	tv	2017-04-12	2	-4/+2
*	krebs.git.cgit: drop support for .retiolum	tv	2017-04-12	1	-1/+0
*	tv: drop .retiolum	tv	2017-04-12	1	-14/+0
*-.	Merge remote-tracking branches 'prism/master' and 'gum/master'	tv	2017-04-12	20	-122/+135
\|\ \
\| \| *	m: .retiolum -> .r	makefu	2017-04-12	2	-39/+29
\| \| *	k 3 m: mv pgp keys	makefu	2017-04-12	3	-2/+2
\| * \|	lass: .retiolum -> .r	lassulus	2017-04-12	3	-26/+12
\| * \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-04-11	8	-43/+57
\| \|\\|
\| * \|	l 2 paste: set client_max_body_size to 4G	lassulus	2017-04-11	1	-0/+1
\| * \|	l 2 repo-sync: sync Reaktor	lassulus	2017-04-11	1	-0/+1
\| * \|	l 2: add kpaste to pkgs	lassulus	2017-04-11	1	-0/+1
\| * \|	k 5 kpaste: init	lassulus	2017-04-11	1	-0/+5
\| * \|	l 1 prism: import paste.nix	lassulus	2017-04-11	1	-0/+1
\| * \|	k 3 l: new prism alias: p.r	lassulus	2017-04-11	1	-0/+1
\| * \|	l 2: add paste.nix	lassulus	2017-04-11	1	-0/+26
\| * \|	l 2 websites domsen: add testuser@ubikmedia.eu	lassulus	2017-04-11	1	-0/+1
\| * \|	l 2 hw tp-x220: disable vertEdgeScroll	lassulus	2017-04-11	1	-0/+1
\| * \|	Revert "l 2: use alternate dnscrypt resolver"	lassulus	2017-04-11	1	-4/+1
\| * \|	l 1 prism: update JuiceSSH pubkey	lassulus	2017-04-11	1	-1/+1
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-04-11	2	-3/+3
\| \|\ \
\| * \| \|	l 2 nixpkgs: ade5837 -> a563923	lassulus	2017-04-11	1	-1/+1
\| * \| \|	Merge remote-tracking branch 'prism/newest'	lassulus	2017-04-02	9	-78/+17
\| \|\ \ \
\| * \| \| \|	l 2 hw tp-x220: set touchpad speed to very slow	lassulus	2017-04-02	1	-1/+5
\| * \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-03-26	12	-36/+74
\| \|\ \ \ \
\| * \| \| \| \|	l 2 mail: use pkgs.concat	lassulus	2017-03-25	1	-3/+6
\| * \| \| \| \|	l 2 websites domsen: add phpfpm restarter	lassulus	2017-03-25	1	-0/+28
\| * \| \| \| \|	l 2 mpv: make scripts compatible with 0.24	lassulus	2017-03-25	1	-23/+11
\| * \| \| \| \|	l 2 monitoring: disable ELK	lassulus	2017-03-25	2	-21/+0
\| * \| \| \| \|	k 3 l: update shodan pubkey	lassulus	2017-03-25	1	-1/+1
* \| \| \| \| \|	Merge remote-tracking branch 'prism/makefu'	tv	2017-04-12	25	-127/+239
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	m: gum takes over euer,wiki,graphs from wry	makefu	2017-04-11	3	-38/+15
\| * \| \| \| \|	m 2 bepasty-dual: use secretKeyFile	makefu	2017-04-11	2	-4/+4
\| * \| \| \| \|	m 5 awesomecfg: add todo	makefu	2017-04-11	1	-0/+1
\| * \| \| \| \|	m 2 deployment/uwsgi: purge	makefu	2017-04-11	1	-16/+0
\| * \| \| \| \|	m 2 deployment: uwsgi add	makefu	2017-04-11	1	-0/+16
\| * \| \| \| \|	m 2 deployment: add graphs	makefu	2017-04-11	1	-0/+37
\| * \| \| \| \|	m 2 urlwatch: remove old vicious url	makefu	2017-04-03	1	-1/+0
\| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge remote-tracking branch 'tv/master'	makefu	2017-03-31	2	-29/+10
\| \|\ \ \ \
\| * \| \| \| \|	m 2 base-gui: Terminus naming fuckup	makefu	2017-03-31	1	-2/+3
\| * \| \| \| \|	k 3 m: disable v6 address for gum	makefu	2017-03-31	1	-1/+1
\| * \| \| \| \|	m 2 default: use cups-dymo patch	makefu	2017-03-31	1	-1/+1
\| * \| \| \| \|	m 2 backup: wry on standby	makefu	2017-03-31	1	-1/+1
\| * \| \| \| \|	m 2 urlwatch: Mic92 is the new maintainer of vicious	makefu	2017-03-31	1	-0/+1