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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of prism.r:stockholm	jeschli	2019-01-29	10	-140/+252
\|\
\| *	Reaktor: 0.6.2 -> 0.7.0	tv	2019-01-27	1	-2/+3
\| *	reaktor2 service: user -> username + proper type	tv	2019-01-27	1	-5/+5
\| *	Reaktor sed-plugin: use mirc colorcodes	lassulus	2019-01-27	1	-0/+4
\| \|\
\| \| *	reaktor2 service: add useTLS option	tv	2019-01-27	1	-0/+4
\| * \|	reaktor2: add user option	lassulus	2019-01-27	1	-3/+7
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-01-22	1	-0/+1
\| \|\\|
\| \| *	krebs: import reaktor2 service	tv	2019-01-22	1	-0/+1
\| * \|	Mic92: change mail address	lassulus	2019-01-21	1	-1/+1
\| * \|	external: add idontcare.r	lassulus	2019-01-21	1	-0/+23
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-01-21	6	-134/+188
\| \|\\|
\| \| *	reaktor2 service: init	tv	2019-01-21	1	-0/+63
\| \| *	krebs hosts: extraHost -> hosts	tv	2019-01-21	1	-13/+12
\| \| *	krebs: move hosts to dedeicated file	tv	2019-01-21	3	-25/+38
\| \| *	krebs: move retiolum-hosts to dedicated file	tv	2019-01-21	2	-23/+29
\| \| *	krebs: move dns stuff to dedicated file	tv	2019-01-21	2	-18/+20
\| \| *	krebs: move exim aliases to dedicated file	tv	2019-01-21	1	-45/+0
\| \| *	krebs: move github known hosts to dedicated file	tv	2019-01-21	2	-25/+41
\| \| *	Merge remote-tracking branch 'prism/master'	tv	2019-01-16	10	-235/+285
\| \| \|\
\| * \| \	Merge remote-tracking branch 'gum/master'	lassulus	2019-01-21	1	-2/+2
\| \|\ \ \
\| \| * \| \|	external: new ip for eve	makefu	2019-01-11	1	-2/+2
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-01-16	2	-1/+2
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/
\| \| *	krebs tinc: Broadcast = no	tv	2019-01-16	1	-0/+1
\| \| *	per-user module: enable only if configured	tv	2019-01-05	1	-1/+1
\| * \|	external matchbox: use free ipv4	lassulus	2019-01-03	1	-1/+1
\| * \|	external: add matchbox	lassulus	2019-01-02	1	-0/+24
* \| \|	Merge branch 'master' of prism.r:stockholm	jeschli	2018-12-28	19	-224/+311
\|\\| \|
\| * \|	external: remove miaoski wrong subnet	lassulus	2018-12-26	1	-3/+0
\| * \|	external: add kmein pubkey	lassulus	2018-12-26	2	-0/+3
\| * \|	external: add miaoski	lassulus	2018-12-25	1	-0/+16
\| * \|	l daedalus.w: fix alias	lassulus	2018-12-25	1	-1/+1
\| * \|	external: set wiregrill ip6	lassulus	2018-12-25	1	-0/+3
\| * \|	l daedalus: fix typo in ipv6	lassulus	2018-12-24	1	-2/+8
\| * \|	l wiregrill: remove obsolete ipv4	lassulus	2018-12-24	1	-3/+0
\| * \|	external: move tpsw from makefu, add justraute	makefu	2018-12-19	4	-56/+53
\| * \|	external: sort	makefu	2018-12-19	1	-176/+176
\| * \|	external: move users from makefu namespace to external	makefu	2018-12-19	6	-16/+23
\| \|/
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2018-12-18	10	-7/+40
\| \|\
\| \| *	tv: configure the wiregrill	tv	2018-12-18	9	-6/+35
\| \| *	lass prism: set wiregrill subnets explicitly	tv	2018-12-18	1	-1/+5
\| * \|	external: add qubasa	lassulus	2018-12-18	1	-0/+28
\| \|/
* \|	Merge branch 'master' of prism.r:stockholm	jeschli	2018-12-16	14	-459/+516
\|\\|
\| *	wirelum -> wiregrill	lassulus	2018-12-16	1	-9/+9
\| *	l: rip xerxes	lassulus	2018-12-15	1	-40/+0
\| *	l: update shodan wirelum key	lassulus	2018-12-15	1	-1/+1
\| *	l: set short ipv6 addresses for all hosts	lassulus	2018-12-15	1	-13/+37
\| *	Merge remote-tracking branch 'lass/master' into HEAD	makefu	2018-12-12	8	-439/+449
\| \|\
\| \| *	krebs hosts: add owner to testHosts, too ^_^'	tv	2018-12-11	1	-2/+2
\| \| *	hosts.*.net.retiolum.ip6.addr: use genipv6	tv	2018-12-11	6	-118/+70
\| \| *	l: add morpheus.r	lassulus	2018-12-09	1	-0/+29