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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ni/master'	lassulus	2019-12-02	1	-26/+14
\|\
\| *	iana-etc module: allow adding new services	tv	2019-12-02	1	-26/+14
* \|	update-nixpkgs-unstable: fix commit msg	lassulus	2019-12-01	1	-1/+1
* \|	l: remove archprism	lassulus	2019-12-01	1	-38/+0
* \|	bepasty-server use python3	lassulus	2019-12-01	1	-4/+4
\|/
*	Merge remote-tracking branch 'prism/master'	tv	2019-11-29	6	-98/+122
\|\
\| *	Merge branch 'master' of http://cgit.gum.r/stockholm	lassulus	2019-11-29	5	-98/+121
\| \|\
\| \| *	shack: streamline ssh-key deployment onto puyak and wolf	makefu	2019-11-25	3	-14/+13
\| \| *	ma shack/prometheus: import alerting-rules from mayflower	makefu	2019-11-25	2	-84/+108
\| * \|	ci: redownload all repos	lassulus	2019-11-29	1	-0/+1
\| \|/
* \|	Merge remote-tracking branch 'prism/master'	tv	2019-11-27	7	-427/+210
\|\\|
\| *	newsbot-js: fix build on 19.09	lassulus	2019-11-24	3	-269/+204
\| *	delete mbmb-rip	lassulus	2019-11-24	2	-152/+0
\| *	nixpkgs: 07e6648 -> 4ad6f14	lassulus	2019-11-24	1	-3/+3
\| *	nixpkgs-unstable: c196652 -> e89b215	lassulus	2019-11-24	1	-3/+3
* \|	krebs exim-smarthost: RIP slash16	tv	2019-11-27	1	-2/+1
\|/
*	nixpkgs-unstable: 7827d3f -> c196652	lassulus	2019-11-17	1	-3/+3
*	nixpkgs: cb2cdab -> 07e6648	lassulus	2019-11-17	1	-3/+3
*	m: use correct tinc addresses for amy/clara	Jörg Thalheim	2019-11-15	1	-4/+4
*	nixpkgs: c5aabb0 -> cb2cdab	lassulus	2019-11-14	1	-3/+3
*	Merge remote-tracking branch 'ni/master'	lassulus	2019-11-12	1	-12/+0
\|\
\| *	Merge remote-tracking branch 'prism/master'	tv	2019-11-12	13	-39/+95
\| \|\
\| * \|	exim: remove because upstream has caught up	tv	2019-11-12	1	-12/+0
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2019-11-12	2	-31/+25
\|\ \ \
\| * \| \|	shack/glados: remove version, google -> google_translate	makefu	2019-11-07	1	-6/+3
\| * \| \|	shack/glados: fix regression, disable influx publisher, disable archiving	makefu	2019-11-07	1	-23/+20
\| * \| \|	shack/node-light: bump to latest hash	makefu	2019-11-07	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	nixpkgs-unstable: 471869c -> 7827d3fnixpkgs	lassulus	2019-11-06	1	-3/+3
* \| \|	nixpkgs: c75de8b -> c5aabb0	lassulus	2019-11-05	1	-3/+3
\|/ /
* \|	nixpkgs-unstable: 4cd2cb4 -> 471869c	lassulus	2019-11-02	1	-3/+3
* \|	Merge remote-tracking branch 'lass/master'	makefu	2019-10-31	3	-15/+71
\|\ \
\| * \	Merge remote-tracking branch 'enklave/master'	lassulus	2019-10-31	1	-12/+12
\| \|\ \
\| \| * \|	j reagenzglas: add new retiolum key	Jeschli	2019-10-30	1	-12/+12
\| * \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2019-10-31	2	-4/+3
\| \|\ \ \
\| * \| \| \|	l: add host amy/clara	Jörg Thalheim	2019-10-30	1	-0/+56
\| * \| \| \|	nixpkgs: 7952807 -> c75de8b	lassulus	2019-10-29	1	-3/+3
* \| \| \| \|	wolf.r: disable swap	makefu	2019-10-31	1	-4/+0
* \| \| \| \|	shack/*: fix regression with mkYarnPackage and pypi2nix generated files	makefu	2019-10-31	5	-11/+12
\| \|/ / / \|/\| \| \|
* \| \| \|	rtorrent module: set listen.owner in phpfpm	makefu	2019-10-28	1	-3/+2
* \| \| \|	shack/muellshack: mkYarnPackage is not vendored anymore, using pkgs.yarn2nix-...	makefu	2019-10-28	1	-1/+1
\|/ / /
* \| \|	reaktor2: fix invalid character crash	lassulus	2019-10-23	1	-0/+3
* \| \|	Merge remote-tracking branch 'enklave/master'	lassulus	2019-10-22	1	-13/+14
\|\\| \|
\| * \|	j reagenzglas: change formating	Jeschli	2019-10-22	1	-13/+14
\| \|/
* /	external: change palos ssh key	Ingolf Wagner	2019-10-21	1	-1/+1
\|/
*	l: remove deprecated users & keys	lassulus	2019-10-17	10	-175/+0
*	Merge remote-tracking branch 'ni/master'	lassulus	2019-10-16	1	-3/+2
\|\
\| *	krebs exim-smarthost: update eloop addresses	tv	2019-10-02	1	-3/+2
* \|	Merge remote-tracking branch 'gum/19.09'	lassulus	2019-10-16	3	-14/+19
\|\ \
\| * \|	shack/muell_mail: use callPackage	makefu	2019-10-15	1	-1/+1
\| * \|	shack/prometheus: use alertmanagers instead of alertmanagerURL	makefu	2019-10-15	1	-1/+6