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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of pnp:stockholm	makefu	2015-11-18	1	-3/+27
\|\
\| *	unstable -> s 2 shack-drivedroid	makefu	2015-11-18	1	-3/+27
* \|	Merge branch 'master' of http://cgit.cd/stockholm	makefu	2015-11-17	1	-0/+10
\|\ \ \| \|/ \|/\|
\| *	Zhosts: add stro	tv	2015-11-17	1	-0/+10
* \|	Merge remote-tracking branch 'cd/master'	makefu	2015-11-17	13	-0/+1250
\|\\|
\| *	mv: init	tv	2015-11-17	13	-0/+1250
* \|	shared 1 wolf: add self to binaryCache	makefu	2015-11-17	1	-0/+4
* \|	s 2 drivedroid: fix syntax error	makefu	2015-11-17	1	-2/+2
* \|	acng: also add nar files to cache	makefu	2015-11-17	1	-1/+1
* \|	k 3 apt-cacher-ng: add CAfile	makefu	2015-11-17	1	-0/+1
* \|	k 3 shared: shack ip was already in use	makefu	2015-11-17	1	-1/+1
* \|	k 5 drivedroid-gen-repo: init at 0.4.2	makefu	2015-11-17	1	-0/+22
* \|	makefu: fix cgit for wry, add gc to wry	makefu	2015-11-17	2	-13/+18
* \|	pubkeys: add exco	makefu	2015-11-17	1	-0/+1
* \|	shared wolf: static ip, fix todo	makefu	2015-11-17	5	-6/+74
* \|	shared 2 base: add makefu_omo to allowed pubkeys	makefu	2015-11-17	1	-0/+2
* \|	m 2 git: fix library and irc hooks	makefu	2015-11-17	2	-17/+33
* \|	m 1 gum: add ssh repo	makefu	2015-11-17	1	-0/+1
* \|	apt-cacher-ng is imported by krebs modules	makefu	2015-11-17	1	-0/+1
* \|	k 3 apt-cacher-ng: fix whitespace	makefu	2015-11-17	1	-34/+35
* \|	apt-cacher-ng: init package and module	makefu	2015-11-17	2	-0/+176
* \|	Merge branch 'master' of pnp:stockholm	makefu	2015-11-15	3	-19/+24
\|\ \
\| * \|	m 1 {gum,wry}: disable dropped packet logging	makefu	2015-11-13	1	-3/+6
\| * \|	tinc_graphs: always restart	makefu	2015-11-13	1	-1/+1
\| * \|	m 1 gum: disable ipv6, open up fw	makefu	2015-11-13	1	-15/+17
* \| \|	Merge remote-tracking branch 'cloudkrebs/master' into pre-merge	makefu	2015-11-14	40	-336/+1055
\|\ \ \
\| * \| \|	shared: add os templates to 2	lassulus	2015-11-13	2	-0/+94
\| * \| \|	l 1 prism: import weechat.nix	lassulus	2015-11-13	1	-0/+1
\| * \| \|	l 2 weechat: bring everything up2date	lassulus	2015-11-13	1	-8/+23
\| * \| \|	l: use bitlbee plugin architecture from nixpkgs	lassulus	2015-11-13	5	-135/+6
\| * \| \|	l 2 base: nixpkgs 7ae05ed -> 8d1ce12	lassulus	2015-11-13	1	-1/+1
\| * \| \|	l 5 go -> k 5 go	lassulus	2015-11-13	3	-4/+3
\| * \| \|	move testhosts to shared from lass	lassulus	2015-11-13	5	-42/+38
\| * \| \|	shared: move stuff from 1/wolf.nix to 2/base.nix	lassulus	2015-11-13	2	-70/+75
\| * \| \|	l 2 base: add monitoring tools	lassulus	2015-11-13	1	-0/+4
\| \|/ /
\| * \|	l 2 git: make prism verbose host	lassulus	2015-11-13	1	-1/+1
\| * \|	l 2 go: adapt to lass.go -> krebs.go	lassulus	2015-11-13	1	-4/+1
\| * \|	l 3 go -> k 3 go	lassulus	2015-11-13	3	-3/+3
\| * \|	l 1 mors: open risk of rain port for lan	lassulus	2015-11-13	1	-0/+6
\| * \|	l 1 mors: use new wordpress test	lassulus	2015-11-13	1	-1/+22
\| * \|	l: use new xserver architecture	lassulus	2015-11-13	10	-29/+527
\| * \|	l 1 prism: add stuff for oneline httpserver	lassulus	2015-11-13	1	-0/+8
\| * \|	l 1 echelon: disable redis	lassulus	2015-11-13	1	-1/+1
\| * \|	l 2 base: nixpkgs rev 6d31e9b -> 7ae05ed	lassulus	2015-11-13	1	-1/+1
\| * \|	l 2 browsers: add simpleScript	lassulus	2015-11-13	1	-1/+9
\| * \|	l 4: remove simpleScript	lassulus	2015-11-13	1	-11/+1
\| * \|	l 3 go: activate redis via mkDefault	lassulus	2015-11-13	1	-0/+5
\| * \|	l 2 configs: use krebs.per-user	lassulus	2015-11-13	1	-5/+1
\| * \|	l 2 git: get secrets the new way	lassulus	2015-11-13	1	-1/+1
\| * \|	l 2 git: adapt to new lib architecture	lassulus	2015-11-13	1	-1/+1