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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'prism/master'	makefu	2016-03-20	8	-45/+63
\|\
\| *	Merge remote-tracking branch 'cd/master'	lassulus	2016-03-19	1	-2/+2
\| \|\
\| \| *	{nukular,darth}: fix addrs6	tv	2016-03-17	1	-2/+2
\| * \|	l 3 *_nginx: remove obsolete ssl option	lassulus	2016-03-19	2	-42/+2
\| * \|	l 2 baseX: add mpv-poll + deps	lassulus	2016-03-19	1	-1/+3
\| * \|	l 5: add mpv-poll	lassulus	2016-03-19	2	-0/+41
\| * \|	l 5: add yt-next	lassulus	2016-03-19	2	-0/+14
\| * \|	k 3 l: add fastpoke pubkey	lassulus	2016-03-19	1	-0/+1
* \| \|	k 3 ma: update to `real` tinc pubkey	makefu	2016-03-19	1	-12/+7
* \| \|	ma 1 add more nginx	makefu	2016-03-19	2	-4/+9
\|/ /
* \|	k 3 l: add lass.pgp.pubkeys.default	lassulus	2016-03-16	2	-0/+53
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-03-16	14	-40/+352
\|\ \
\| * \|	ma 1 omo: fix misleading comment	makefu	2016-03-16	1	-1/+3
\| * \|	ma 1 gum: allow vbob and omo users	makefu	2016-03-16	1	-0/+6
\| * \|	ma 1 darth: configure aux disk	makefu	2016-03-16	1	-3/+25
\| * \|	ma 2 default: really do use tinc_pre	makefu	2016-03-16	1	-0/+1
\| * \|	k 3 ma: expose pgp pubkeys	makefu	2016-03-16	1	-3/+5
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2016-03-16	7	-27/+175
\| \|\\|
\| \| *	krebs types += tinc-pubkey	tv	2016-03-16	1	-1/+3
\| \| *	krebs types += pgp-pubkey, user.pgp.pubkey	tv	2016-03-16	2	-1/+14
\| \| *	krebs types += ssh-{priv,pub}key	tv	2016-03-16	1	-21/+23
\| \| *	krebs lib += getAttrDef	tv	2016-03-16	1	-0/+1
\| \| *	krebs types.host.ssh.pubkeys: trace only own missing keys	tv	2016-03-16	1	-4/+4
\| \| *	krebs lib += optionalTrace	tv	2016-03-16	1	-1/+3
\| \| *	krebs.users.tv.pgp.pubkey: 2CAEE3B5	tv	2016-03-16	1	-0/+29
\| \| *	Merge remote-tracking branch 'gum/master'	tv	2016-03-16	17	-102/+351
\| \| \|\
\| \| * \|	krebs.backup: use krebs.on-failure	tv	2016-03-15	1	-0/+6
\| \| * \|	krebs.on-failure: init	tv	2016-03-15	2	-0/+92
\| * \| \|	Merge branch 'master' of gum:stockholm	makefu	2016-03-16	1	-6/+23
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	add new retiolum short form to default hostnames	makefu	2016-03-15	1	-0/+1
\| \| * \|	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2016-03-15	9	-17/+5
\| \| \|\ \
\| \| * \| \|	k 3 nginx: add default404 option	makefu	2016-03-15	1	-6/+22
\| * \| \| \|	k 3 ma: add default and brain	makefu	2016-03-16	2	-0/+115
\| \| \|/ / \| \|/\| \|
* \| \| \|	l 2 vim: add file-line plugin	lassulus	2016-03-15	1	-3/+13
* \| \| \|	l 2 baseX: add xbacklight	lassulus	2016-03-15	1	-0/+1
* \| \| \|	l 3 newsbot-js -> k 3 newsbot-js	lassulus	2016-03-15	4	-7/+4
* \| \| \|	l 2 base: activate timesyncd	lassulus	2016-03-15	1	-1/+2
* \| \| \|	k 5 newsbot-js: bump rev 802b172 -> 09e0163	lassulus	2016-03-15	1	-3/+3
* \| \| \|	l 5 newsbot-js -> k 5 newsbot-js	lassulus	2016-03-15	3	-1/+0
* \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-03-15	16	-96/+328
\|\\| \| \|
\| * \| \|	ma 2: use tinc-pre per default	makefu	2016-03-15	9	-17/+5
\| \|/ /
\| * \|	ma 1 darth: add omo ssh pubkey	makefu	2016-03-11	1	-0/+3
\| * \|	Merge branch 'master' of gum:stockholm-bare	makefu	2016-03-11	3	-10/+11
\| \|\ \
\| * \| \|	s 1 wolf: use tinc_pre for local discovery	makefu	2016-03-11	3	-0/+5
\| * \| \|	s 2 base: use default connectTo	makefu	2016-03-11	1	-9/+1
\| * \| \|	k 3 makefu: add hosts near to my heart <3	makefu	2016-03-11	1	-35/+235
\| * \| \|	ma 2 tinc-basic-retiolum: RIP	makefu	2016-03-11	9	-37/+32
\| * \| \|	k 3 retiolum: pigstarter -> [ prism cd ]	makefu	2016-03-11	1	-1/+1
\| * \| \|	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2016-03-10	6	-31/+83
\| \|\ \ \
\| * \| \| \|	s 2 shared: build without debug	makefu	2016-03-10	1	-2/+1