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

	Commit message (Collapse)	Author	Age	Files	Lines
*	test-all-krebs-modules: disable buildbot.master	tv	2016-07-09	1	-1/+3
\|
*	Merge remote-tracking branch 'prism/master'	tv	2016-07-09	17	-42/+2450
\|\
\| *	l 1 mors: add zalando project	lassulus	2016-07-08	1	-6/+9
\| \|
\| *	l 1 helios: disable ES (again)	lassulus	2016-07-08	1	-5/+5
\| \|
\| *	l 1 prism: add mk_sql_pair	lassulus	2016-07-08	1	-0/+5
\| \|
\| *	l 1 helios: use gnome3 as desktopManager	lassulus	2016-07-08	1	-2/+32
\| \|
\| *	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-08	1	-0/+36
\| \|\
\| * \|	l 1 prism: remove obsolete certfile option	lassulus	2016-07-08	1	-1/+0
\| \| \|
\| * \|	Revert "l 1 uriel: update boot.loader options"	lassulus	2016-07-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f9c561566d1b18bb89f0eff33cdbd0225300ab2f.
\| * \|	s 2 repo-sync: adapt to new api	lassulus	2016-07-07	1	-1/+1
\| \| \|
\| * \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-07-07	11	-20/+2378
\| \|\ \
\| \| * \|	m 5 farpd: init	makefu	2016-06-28	3	-2/+1669
\| \| \| \|
\| \| * \|	m 5 honeyd: initial commit	makefu	2016-06-27	2	-0/+104
\| \| \| \|
\| \| * \|	m 1 p: allow 24800 (synergy)	makefu	2016-06-27	1	-1/+1
\| \| \| \|
\| \| * \|	k 5 awesomecfg: add kiosk config	makefu	2016-06-27	3	-0/+535
\| \| \| \|
\| \| * \|	k 3 m: add siem network, add ossim stub	makefu	2016-06-27	1	-0/+14
\| \| \| \|
\| \| * \|	wbob: add synergy	makefu	2016-06-27	1	-18/+26
\| \| \| \|
\| \| * \|	m 5 ps3netsrv: init	makefu	2016-06-24	2	-0/+30
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-07	9	-39/+309
\| \|\ \ \
\| * \| \| \|	Revert "l 5 q: use curl.bin"	lassulus	2016-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f12578c66f8b7b829c0dec5255f358778c0d3366.
\| * \| \| \|	l 1 prism: fix ssl for cgit.lassul.us	lassulus	2016-07-07	1	-4/+17
\| \| \| \| \|
* \| \| \| \|	urlwatch: 2.1 -> 2.2	tv	2016-07-09	2	-2/+48
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	tv backup: add zu	tv	2016-07-08	1	-0/+36
\| \|/ / \|/\| \|
* \| \|	Merge remote-tracking branch 'prism/master'	tv	2016-07-07	7	-37/+46
\|\\| \|
\| * \|	l 3 ejabberd: take config from tv	lassulus	2016-07-07	2	-6/+16
\| \| \|
\| * \|	l 1 helios: configure batter monitoring	lassulus	2016-07-07	1	-0/+3
\| \| \|
\| * \|	l 2 nixpkgs: c78f9ad -> 446d4c1	lassulus	2016-07-07	1	-1/+1
\| \| \|
\| * \|	Revert "l 2 websites: phpIni -> phpOptions"	lassulus	2016-07-07	2	-25/+20
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit abdf11a17331401e3fca5e73dd38b241614c5aea.
\| * \|	k 3 buildbot: use last working nixpkgs	lassulus	2016-07-07	1	-5/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'prism/lassulus'	tv	2016-07-07	8	-26/+74
\|\\| \|
\| * \|	l 2: nix.useSandbox -> nix.useChroot	lassulus	2016-07-05	1	-1/+1
\| \| \|
\| * \|	l 1 uriel: update boot.loader options	lassulus	2016-07-05	1	-2/+2
\| \| \|
\| * \|	l: build module from 2/umts	lassulus	2016-07-05	4	-12/+57
\| \| \|
\| * \|	l 3 power-action: add option for battery	lassulus	2016-07-05	1	-2/+6
\| \| \|
\| * \|	use buildbot from 15.09	lassulus	2016-07-04	2	-9/+8
\| \| \|
* \| \|	zu: init	tv	2016-07-07	2	-0/+260
\| \| \|
* \| \|	tv: use timesyncd	tv	2016-07-03	5	-4/+1
\| \| \|
* \| \|	tv: define journald default extraConfig	tv	2016-07-03	5	-20/+7
\| \| \|
* \| \|	Revert "tv nginx: define events"	tv	2016-07-03	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9962ba1036945652c1b1cfd661d92377b4dc691e.
* \| \|	cd nginx: enable https	tv	2016-07-03	1	-11/+41
\|/ /
* \|	Revert "buildbot: RIP"	lassulus	2016-07-03	1	-0/+8
\| \| \| \| \| \| \| \|	This reverts commit c786da701a9a430df7ee398c14cbaadb9e0fabb0.
* \|	tv vim: unlet b:current_syntax if exists	tv	2016-07-03	1	-1/+3
\| \|
* \|	tv vim: add jq syntax	tv	2016-07-03	1	-0/+12
\| \|
* \|	writeJq: init	tv	2016-07-03	1	-0/+11
\| \|
* \|	Merge remote-tracking branch 'prism/master'	tv	2016-07-03	6	-14/+43
\|\ \
\| * \	Merge commit '2408e27fb198634c5e47885e5793ec2b96bcc3a5'	lassulus	2016-07-01	1	-0/+24
\| \|\ \
\| * \| \|	l 2 websites domsen: fix some cert generation	lassulus	2016-07-01	1	-2/+2
\| \| \| \|
\| * \| \|	k 5 go: set url to cgit.lassul.us	lassulus	2016-07-01	1	-1/+1
\| \| \| \|
\| * \| \|	l 2 git: remove miefda	lassulus	2016-06-30	1	-1/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-06-30	34	-2924/+266
\| \|\ \ \