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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'cd/master'	makefu	2016-02-12	5	-30/+31
\|\
\| *	Makefile: enable "make install"	tv	2016-02-12	1	-11/+10
\| *	Makefile: interpolate $(target_*) for a nicer log	tv	2016-02-12	1	-2/+2
\| *	xmonad-stockholm: 1.0.0 -> 1.1.0	tv	2016-02-12	2	-15/+14
\| *	nixpkgs: expose stockholm pkgs	tv	2016-02-12	2	-2/+5
* \|	k 5 repo-sync: 0.2.0 -> 0.2.5	makefu	2016-02-12	1	-2/+2
* \|	Merge remote-tracking branch 'cd/master'	makefu	2016-02-12	1	-3/+17
\|\\|
\| *	Merge remote-tracking branch 'gum/master'	tv	2016-02-11	16	-91/+134
\| \|\
\| * \|	krebs.retiolum.hosts*: bump description	tv	2016-02-11	1	-3/+17
* \| \|	k 5 repo-sync: 0.1.1 -> 0.2.0	makefu	2016-02-12	1	-2/+2
\| \|/ \|/\|
* \|	s 2 base: bump revision	makefu	2016-02-11	1	-1/+1
* \|	k 3 tinc_graphs: use new tinc-hosts	makefu	2016-02-11	1	-1/+1
* \|	Merge remote-tracking branch 'cd/master'	makefu	2016-02-11	1	-13/+16
\|\\|
\| *	krebs.retiolum: make hostsPackage configurable	tv	2016-02-11	1	-13/+16
* \|	Merge remote-tracking branch 'cd/master'	makefu	2016-02-11	204	-2138/+1410
\|\\|
\| *	cac-api: PATH += gnugrep (how could this ever pass full-tests?! :D)	tv	2016-02-11	1	-1/+2
\| *	tv x220: rm AccepMethod sna	tv	2016-02-11	1	-3/+0
\| *	tv x220: remove unused stuff	tv	2016-02-11	1	-13/+0
\| *	*: turn 5pkgs into a(n optional) module	tv	2016-02-11	8	-86/+85
\| *	krebs.nixpkgs.allowUnfreePredicate: init	tv	2016-02-10	4	-2/+46
\| *	krebs.backup: admit plan.startAt	tv	2016-02-08	1	-2/+1
\| *	tv git: bump descs	tv	2016-02-08	1	-5/+5
\| *	tv.iptables: inline startScript and use SyslogIdentifier	tv	2016-02-08	1	-11/+7
\| *	Merge remote-tracking branch 'cloudkrebs/master'	tv	2016-02-08	31	-84/+816
\| \|\
\| \| *	l 2 xserver: add pulseaudio to xserver deps	lassulus	2016-02-06	1	-0/+1
\| \| *	l 2 browsers: don't import per-user.nix	lassulus	2016-02-06	1	-2/+0
\| \| *	l 2 base: require pkgs.proot for stockholm	lassulus	2016-02-06	1	-0/+1
\| \| *	l 2 base: krebs.source adapt to api change	lassulus	2016-02-06	1	-12/+12
\| \| *	l 1 mors: pkgs.cac -> pkgs.cac-api	lassulus	2016-02-06	1	-1/+1
\| \| *	Merge remote-tracking branch 'cd/master'	lassulus	2016-02-06	198	-2585/+881
\| \| \|\
\| \| * \|	l 1 dishfire: import git.nix	lassulus	2016-02-01	1	-0/+1
\| \| * \|	k 3 l: add ssh host key for dishfire	lassulus	2016-02-01	1	-2/+2
\| \| * \|	l 1 helios: import git.nix	lassulus	2016-02-01	1	-0/+1
\| \| * \|	l: add fritz websites to dishfire	lassulus	2016-02-01	2	-0/+34
\| \| * \|	l 3 *_nginx: allow configuration of ssl	lassulus	2016-02-01	3	-5/+97
\| \| * \|	l 2 xserver: copy default.nix from tv	lassulus	2016-02-01	1	-3/+4
\| \| * \|	l 2 newsbot-js: disable truther feed	lassulus	2016-02-01	1	-1/+1
\| \| * \|	l 2 websites wohnprojekt: add laura user	lassulus	2016-02-01	1	-0/+6
\| \| * \|	l 2 buildbot-sta..: change name to buildbot-lass	lassulus	2016-02-01	1	-1/+1
\| \| * \|	l 1 mors: update nginx tests	lassulus	2016-02-01	1	-36/+55
\| \| * \|	l: add helios as new system	lassulus	2016-02-01	3	-0/+113
\| \| * \|	l 2: give helios & uriel more access	lassulus	2016-02-01	2	-4/+5
\| \| * \|	l 1 mors: remove redundant retiolum import	lassulus	2016-02-01	1	-1/+0
\| \| * \|	k 3 l: declare pubkeys inline	lassulus	2016-02-01	3	-5/+3
\| \| * \|	k 3 l: remove dead hosts	lassulus	2016-02-01	1	-16/+0
\| \| * \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-02-01	17	-32/+231
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'cd/master'	lassulus	2016-02-01	19	-92/+425
\| \| \|\ \ \
\| \| * \| \| \|	l 2 bitcoin: add sudo config	lassulus	2016-01-19	1	-1/+6
\| \| * \| \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-01-17	6	-20/+30
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge remote-tracking branch 'gum/master'	lassulus	2016-01-17	16	-43/+188
\| \| \|\ \ \ \ \