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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\
\| *	k 5/test/infest-cac: add ca-bundle for python	makefu	2016-01-29	1	-1/+2
\| *	Merge branch 'fix-cert': adds cac panel cert	makefu	2016-01-29	2	-1/+90
\| \|\
\| \| *	Merge branch 'master' of gum:stockholm into fix-cert	makefu	2016-01-29	2	-6/+39
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	ma 1 omo: cleanup, fix firewalling	makefu	2016-01-27	1	-18/+11
\| * \|	ma 1 omo: add samba share	makefu	2016-01-27	1	-5/+44
\| * \|	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2016-01-23	2	-2/+13
\| \|\ \
\| \| * \|	s 1 wolf: add grafana service	makefu	2016-01-23	1	-1/+12
\| \| * \|	Merge branch 'master' of gum:stockholm	makefu	2016-01-23	17	-27/+87
\| \| \|\ \
\| * \| \| \|	ma 2 urlwatch: add acng	makefu	2016-01-23	1	-0/+1
\| \| \|/ / \| \|/\| \|
\| \| \| *	s 1 wolf: add grafana service	makefu	2016-01-23	1	-1/+12
\| \| \| *	Merge branch 'master' of gum:stockholm into fix-cert	makefu	2016-01-22	7	-3/+60
\| \| \| \|\ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	k 5 acng: bump to 0.8.8	makefu	2016-01-19	1	-2/+2
\| * \| \|	s 2 buildbot: add show-trace	makefu	2016-01-19	1	-0/+2
\| * \| \|	makefu: init wbob	makefu	2016-01-19	3	-0/+53
\| * \| \|	s 2 base: use current unstable	makefu	2016-01-19	2	-8/+3
\| * \| \|	ma 1 vbob: remove unstable	makefu	2016-01-19	1	-9/+10
\| * \| \|	k 5 forticlientsslvpn: fix license	makefu	2016-01-19	1	-1/+1
\| * \| \|	ma 5 awesomecfg/full: remove volume field	makefu	2016-01-19	1	-3/+0
\| * \| \|	ma 2 tinc-basic-retiolum: remove obsolete hosts path - corresponds with defaults	makefu	2016-01-19	1	-1/+0
\| * \| \|	ma 2 git/cgit: add init-stockholm repo	makefu	2016-01-19	1	-0/+3
\| \| \| *	k 5 cac: temporarily disable tasks from update	makefu	2016-01-18	2	-1/+12
\| \| \| *	Merge remote-tracking branch 'gum/fix-cert' into fix-cert	makefu	2016-01-18	13	-25/+117
\| \| \|/\|
\| \| \| *	k 5 test: add cac panel crt	makefu	2016-01-18	2	-1/+90
\| \| \| *	s 2 base: use current unstable	makefu	2016-01-18	2	-8/+3
\| \| \| *	ma 1 vbob: remove unstable	makefu	2016-01-18	1	-9/+10
\| \| \| *	k 5 forticlientsslvpn: fix license	makefu	2016-01-18	1	-1/+1
\| \| \| *	Merge branch 'master' of gum:stockholm	makefu	2016-01-18	95	-774/+1896
\| \| \| \|\ \| \| \|_\|/ \| \|/\| \|
\| \| \| *	ma 5 awesomecfg/full: remove volume field	makefu	2016-01-13	1	-3/+0
\| \| * \|	Merge branch 'master' of gum:stockholm	makefu	2016-01-16	13	-40/+175
\| \| \|\ \
\| \| * \| \|	k 5 lentil: haskellng -> haskell	makefu	2016-01-16	1	-1/+1
* \| \| \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-02-01	19	-92/+425
\|\ \ \ \ \
\| * \| \| \| \|	krebs/populate.nix: chmod 0755 "$tmpdir"	tv	2016-02-01	1	-0/+1
\| * \| \| \| \|	tv config: isUser root == true	tv	2016-02-01	1	-1/+2
\| * \| \| \| \|	krebs.populate: disable copy-links, owner, and group	tv	2016-02-01	1	-1/+1
\| * \| \| \| \|	xu: use upstream lentil	tv	2016-02-01	1	-1/+1
\| * \| \| \| \|	much: use haskellPackages	tv	2016-02-01	1	-1/+1