Commit Graph

1767 Commits

Author SHA1 Message Date
makefu
8f98ae9842 m 3 buildbot/master: use genid 2015-12-26 10:54:02 +01:00
makefu
ed4db71add Merge remote-tracking branch 'cd/master' 2015-12-26 10:51:18 +01:00
makefu
cef2be532b m 3 Reaktor: add workdir/state_dir 2015-12-26 10:44:56 +01:00
tv
763f0db52a {pkgs => lib}.genid 2015-12-26 05:58:37 +01:00
makefu
3adf78473d k 3 buildbot.master: refactor
see buildbot-standalone.nix in shared/2configs for the current buildbot config
2015-12-24 00:02:59 +01:00
makefu
6b7506dc67 k 3 buildbot: add rsync as explicit dep
do not be pure yet
2015-12-23 17:13:16 +01:00
makefu
1ef9af2c9a k 3 buildbot/master: send sigterm before sigkill for cleanup 2015-12-23 16:20:27 +01:00
makefu
9a38671871 k 3 buildbot: fix merge fuckup 2015-12-23 16:06:41 +01:00
makefu
b8ac3e2b8d Merge branch 'master' of gum.krebsco.de:stockholm 2015-12-23 11:20:42 +01:00
makefu
14ddb767eb k 5 mv krebs-ci test/infest-cac-centos7 2015-12-23 11:18:00 +01:00
makefu
dc8e270d2a m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:37:40 +01:00
makefu
f59080e76f m 3 buildbot: add new slow factory to complete integration test 2015-12-23 00:20:37 +01:00
makefu
56e8346faa k 5 krebs-ci: remove obsolete trap rm 2015-12-22 20:53:11 +01:00
makefu
bf1b6482ce mv makefu->krebs 3 buildbot 2015-12-22 19:36:22 +01:00
makefu
f7da5211f3 m 1 omo: init 2015-12-16 12:06:44 +01:00
makefu
b5eafa4c03 k 3 makefu: gum provides cgit.gum 2015-12-15 12:44:41 +01:00
makefu
9bc0c474ac m 2 Reaktor: add full profile 2015-12-14 17:12:51 +01:00
makefu
8114470587 Merge branch 'master' of gum:stockholm 2015-12-14 17:04:32 +01:00
makefu
781573b9dd k Zpubkeys: makefu* -> 3modules 2015-12-14 17:04:16 +01:00
makefu
83924b9b6c m 1 vbob:init 2015-12-14 14:33:06 +01:00
makefu
27ca97b78f k 3 retiolum: add extraConfig 2015-12-14 14:18:08 +01:00
makefu
1c17881aed k 3 fetchWallpaper: change predicate handling
a failed predicate does not result in a failed system service
it will just not download the remote
2015-12-13 13:50:39 +01:00
lassulus
25c1a1c5ee k 3 fetchWallpaper: default stateDir in /var 2015-12-12 19:37:52 +01:00
lassulus
1b9a044b44 l 3 fetchWallpaper -> k 3 fetchWallpaper 2015-12-12 19:37:13 +01:00
makefu
65cc52e01e Merge branch 'master' of pnp:stockholm
Conflicts:
	makefu/1systems/gum.nix
2015-12-04 10:16:09 +01:00
makefu
597f9e8597 k 3 tinc_graphs: add timeout 2015-12-03 20:39:29 +01:00
makefu
c7bb244bdf m 1 gum: provides mattermost via docker container 2015-11-27 23:10:44 +01:00
lassulus
f531e7e625 Merge remote-tracking branch 'pnp/master' 2015-11-21 14:25:02 +01:00
lassulus
a020268317 Merge remote-tracking branch 'cd/master' 2015-11-21 14:24:46 +01:00
tv
817a78c711 krebs: add cgit.stro.retiolum 2015-11-18 01:20:17 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
84743dcd4a Merge remote-tracking branch 'cd/master' 2015-11-17 23:14:28 +01:00
makefu
0f54a195b7 acng: also add nar files to cache 2015-11-17 23:11:29 +01:00
makefu
a3e074094b k 3 apt-cacher-ng: add CAfile 2015-11-17 23:03:21 +01:00
makefu
b8dea556e9 k 3 shared: shack ip was already in use 2015-11-17 22:26:11 +01:00
makefu
5aed0a395b shared wolf: static ip, fix todo 2015-11-17 22:15:07 +01:00
tv
dba0db28d9 mv: init 2015-11-17 19:04:32 +01:00
makefu
5a450ad787 apt-cacher-ng is imported by krebs modules 2015-11-17 13:49:29 +01:00
makefu
4c26fb9383 k 3 apt-cacher-ng: fix whitespace 2015-11-17 13:29:56 +01:00
makefu
48c9789141 apt-cacher-ng: init package and module
once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
2015-11-17 12:16:51 +01:00
makefu
dcf55255e6 Merge branch 'master' of pnp:stockholm 2015-11-15 20:18:35 +01:00
lassulus
d0a573c4c5 k 3 l: bump echelon internet addr 2015-11-14 17:54:08 +01:00
lassulus
a204949071 move testhosts to shared from lass 2015-11-13 13:05:19 +01:00
makefu
383d875023 tinc_graphs: always restart 2015-11-13 12:24:43 +01:00
lassulus
58eab5df69 l 3 go -> k 3 go 2015-11-13 01:18:30 +01:00
tv
bbcdef021a Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-11-07 10:38:27 +01:00
tv
8ad05d0f40 Merge remote-tracking branch 'cd/master' 2015-11-07 09:48:06 +01:00
tv
d590cf26cd xu: bump ssh key 2015-11-07 09:45:43 +01:00
tv
1d8be110e1 nomic: bump ssh key 2015-11-07 09:43:05 +01:00
makefu
9a0e67cf65 Merge remote-tracking branch 'cd/master' 2015-11-06 22:38:44 +01:00
makefu
736e1426d5 Merge branch 'master' of pnp:stockholm 2015-11-06 22:23:46 +01:00
tv
4d93a8215f krebs.build.source.dir.host defaults to current.host 2015-11-06 22:20:26 +01:00
tv
a0c068d6ec {tv => krebs} per-user 2015-11-06 21:37:58 +01:00
tv
f58d024f48 tv: add users.tv_{wu,nomic}.pubkey 2015-11-06 19:45:50 +01:00
makefu
e8ad43c082 k 4 makefu: add filepimp 2015-11-06 10:59:40 +01:00
makefu
2e785e6be5 k 3 makefu: wry handles blog and wiki 2015-11-05 12:31:54 +01:00
makefu
625cfe81a0 Merge remote-tracking branch 'cd/master' 2015-11-05 11:10:14 +01:00
tv
9b985720ea nomic: fix ssh.{priv,pub}key 2015-11-02 13:51:03 +01:00
lassulus
f171c53dd8 k 3 l: use rsa keys in prism 2015-11-01 19:52:49 +01:00
lassulus
10779f3cb9 Merge remote-tracking branch 'pnp/master' 2015-10-31 00:14:35 +01:00
lassulus
8dd8ddb27d lass: add prism host 2015-10-30 16:05:51 +01:00
lassulus
2ba85cff33 k 3 l: echelon has 2 cores 2015-10-29 15:12:46 +01:00
makefu
84ebd8c021 m 1 wry: serve euer wiki 2015-10-28 22:06:17 +01:00
makefu
c6ca11062a m 1 gum: prepare stockholm 2015-10-28 15:06:41 +01:00
makefu
526adba3c8 k 3 urlwatch: add verbose flag 2015-10-26 00:17:48 +01:00
makefu
6425831452 k 3 tinc_graphs: is now completely self-contained 2015-10-25 21:54:59 +01:00
lassulus
43b856994f Merge remote-tracking branch 'cd/master' 2015-10-25 21:27:26 +01:00
makefu
bb16a38df6 Merge remote-tracking branch 'cd/master' 2015-10-25 18:17:14 +01:00
makefu
cca25c7b66 wry: listen for graphs.retiolum 2015-10-25 18:06:46 +01:00
tv
8f15daf2ea init krebs.current 2015-10-25 14:15:21 +01:00
tv
daa8fe2aa8 init users.shared.wolf 2015-10-25 14:08:51 +01:00
tv
3dcc050cd9 Merge remote-tracking branches 'mors/master' and 'pnp/master' 2015-10-24 10:07:00 +02:00
makefu
a1d05482e5 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-23 15:38:01 +02:00
makefu
709ebf6bbc krebs 3 zone-generation: for consistency, add newline at the end 2015-10-23 15:31:31 +02:00
makefu
5842130703 wrong MX entry resulted in inability to upload zone 2015-10-23 14:39:35 +02:00
lassulus
93dcfe5ad6 Merge remote-tracking branch 'cd/master' 2015-10-22 20:21:01 +02:00
tv
128e5feae9 Merge remote-tracking branch 'pnp/master' 2015-10-22 20:14:01 +02:00
makefu
f092e6acb4 krebs 3 zones: remove empty lines 2015-10-22 17:17:04 +02:00
makefu
be39c6d849 krebs 3 bepasty-server: styling 2015-10-22 16:14:37 +02:00
makefu
9bb3069f69 krebs 3 tinc_graphs: mv from makefu 3 tinc_graphs 2015-10-22 15:33:05 +02:00
makefu
9be59a0400 krebs 3 modules: bepasty-server is a krebs module 2015-10-22 15:26:54 +02:00
lassulus
692a59423a Merge remote-tracking branch 'pnp/master' 2015-10-21 19:06:48 +02:00
makefu
6eb195b0bc wry: is the new provider for paste.krebsco.de 2015-10-21 18:49:20 +02:00
makefu
dc1bb40c45 krebs 3 nginx: extraConfig is type string 2015-10-21 18:44:51 +02:00
lassulus
864f39634b Merge remote-tracking branch 'cd/master' 2015-10-21 13:52:20 +02:00
lassulus
14f08e2a1c k 3 l: add cores to testsystems 2015-10-21 13:51:10 +02:00
tv
b55f07e57a mkdir: 104.233.84.215 -> 104.167.114.142 2015-10-21 13:48:53 +02:00
lassulus
a19cf6d4a3 Merge remote-tracking branch 'cd/master' 2015-10-21 13:40:23 +02:00
tv
0863983b7d wu: add alias cgit.wu.retiolum 2015-10-21 13:16:04 +02:00
tv
3ce57c3de3 stockholm: provide krebs lib 2015-10-21 01:53:07 +02:00
lassulus
309102967e l: add test systems 2015-10-21 01:52:47 +02:00
tv
226ea391ca stockholm: provide krebs lib 2015-10-21 00:11:12 +02:00
lassulus
114bbe669a Merge remote-tracking branch 'pnp/master' 2015-10-20 23:47:39 +02:00
lassulus
f6187b3796 Merge remote-tracking branch 'cd/master' 2015-10-20 23:47:29 +02:00
makefu
0bc015bf3c krebs 3 retiolum-bootstra: use nginx listen list
consolidate nginx servers into 1, provide a means to override the listen
addresses.
2015-10-20 20:00:05 +02:00
makefu
e0eed572ec Merge remote-tracking branch 'cd/master' 2015-10-20 19:17:25 +02:00
tv
b2fd7be3ff nginx service: allow multiple listen entries 2015-10-20 18:53:11 +02:00
makefu
ded0821d9b m 1,2 : wry serves as iodine entry point 2015-10-19 23:46:10 +02:00
makefu
8d3ebfc096 krebs 3 retiolum-bootstrap: fix assert todo 2015-10-19 21:57:05 +02:00
makefu
858034cc61 m 1 wry: host is the new provider for tinc.krebsco.de 2015-10-19 21:51:20 +02:00
makefu
754ea55ab8 krebs 3 retiolum-bootstrap: init module 2015-10-19 21:50:25 +02:00
tv
dc52c4b988 nginx service: replace port by listen 2015-10-19 20:42:18 +02:00
tv
222ca361e3 nginx service: add port option and extraConfig 2015-10-19 20:36:09 +02:00
lassulus
ffef87c5df l: specify krebs.hosts.*.nets.gg23 2015-10-18 17:50:54 +02:00
tv
8af96d3245 tv: specify krebs.hosts.*.nets.gg23 2015-10-18 16:14:07 +02:00
tv
d50d582560 add krebs.dns.providers.gg23 2015-10-18 16:12:14 +02:00
tv
c9a3d1a3d9 tv extraZones: set TTL to 60 2015-10-17 21:42:03 +02:00
tv
5c5b421b20 Merge remote-tracking branch 'pnp/master' 2015-10-17 21:33:23 +02:00
tv
9f4f51b1c7 cd,ire: add extraZones 2015-10-17 21:32:59 +02:00
makefu
5d0e4243bf krebs 3 makefu: remove retard entries for pigstarter 2015-10-17 21:21:13 +02:00
tv
9efe536e45 cd: claim cgit.cd.krebsco.de 2015-10-17 18:31:27 +02:00
makefu
f83b3770dd krebs 2 Reaktor: Delay Restart of Reaktor - avoid fast restart loops 2015-10-17 11:17:54 +02:00
tv
335ea5a4c1 Merge remote-tracking branch 'mors/master' 2015-10-14 19:24:36 +02:00
lassulus
69098a4847 use go as url-shortener for newsbot-js 2015-10-14 19:22:44 +02:00
tv
96f4248b65 Merge remote-tracking branch 'cloudkrebs/master' 2015-10-09 14:48:58 +02:00
tv
694c79a5bc github-hosts-sync service: fix directory creation 2015-10-09 14:32:45 +02:00
tv
51e4b62de2 krebs.github-host-sync.ssh-identity-file: fix type 2015-10-09 14:11:38 +02:00
tv
87fa7792e3 disband github-known_hosts harder 2015-10-09 13:34:25 +02:00
lassulus
938b6fe278 Merge remote-tracking branch 'nomic/master' 2015-10-09 13:27:02 +02:00
tv
f1cc52aeaf known_hosts: GitHub is 192.30.252.0/22 2015-10-09 13:18:21 +02:00
tv
9ae6d1611e add github.com and its addrs4 to known_hosts 2015-10-09 12:06:00 +02:00
makefu
2460a6c226 krebs 3 realwallpaper: actually start realwallpaper as timer 2015-10-07 15:20:12 +02:00
lassulus
eabf194460 krebs 3 lass: add ssh pubkeys 2015-10-05 16:33:41 +02:00
lassulus
cf28831057 move realwallpaper to krebs 3 2015-10-05 14:49:36 +02:00
tv
059037f5ec register krebsco.de internet aliases 2015-10-05 03:29:04 +02:00
tv
214bd7a3b2 register retiolum "internet" aliases 2015-10-05 03:09:01 +02:00
tv
a626c2a070 postmaster@krebsco.de -> spam-ml 2015-10-05 03:09:01 +02:00
tv
8167fe985a define spam-ml in krebs/3modules 2015-10-05 03:09:01 +02:00
tv
04c0f3935b Merge remote-tracking branch 'pnp/master' 2015-10-04 22:28:27 +02:00
tv
41df3589f6 rmdir: bump ipaddr 2015-10-04 20:55:30 +02:00
makefu
1140a16ba6 configure graphs for wry 2015-10-04 19:46:34 +02:00
lassulus
829b8303ce krebs 3 lass: bump echelon ip (again) 2015-10-04 15:16:14 +02:00
lassulus
f9e36ec9e2 krebs 3 lass: bump echelon ip 2015-10-04 14:14:35 +02:00
lassulus
161c81e54e krebs 3 lass: bump echelon ip 2015-10-04 13:32:50 +02:00
lassulus
1e410cd232 Merge branch 'makefu' 2015-10-01 22:45:17 +02:00
lassulus
1078d1a8a3 move iptables.nix to krebs 2015-10-01 22:10:21 +02:00
tv
d5d3c9f8b3 krebs modules: finalize default.nix split 2015-10-01 18:56:41 +02:00
makefu
49c00cf74f Merge remote-tracking branch 'cd/master' 2015-10-01 18:49:34 +02:00
makefu
4d5bfae7b2 fix wry ip 2015-10-01 18:48:49 +02:00
tv
4af4fa89e5 Merge remote-tracking branch 'uriel/master' 2015-10-01 17:26:26 +02:00
tv
cd61f94ba0 Merge remote-tracking branch 'pnp/master' 2015-10-01 17:16:57 +02:00
tv
2432695678 krebs lib.types: deprecate host.infest.{addr,port} 2015-10-01 14:59:58 +02:00
lassulus
842bcf117a Merge branch 'makefu' 2015-10-01 14:48:57 +02:00
lassulus
4bacf702b0 Merge branch 'tv' 2015-10-01 14:48:51 +02:00
tv
2ef889b1c4 mkdir: 104.233.84.{174 -> 215} 2015-10-01 14:26:50 +02:00
tv
bfe0723728 move config scripts to krebs 2015-10-01 02:19:13 +02:00
makefu
e1ec3ff1ef Merge remote-tracking branch 'cd/master' 2015-09-30 19:45:24 +02:00
lassulus
ceb8226bc4 krebs: new key for echelon 2015-09-30 15:19:31 +02:00
lassulus
0f2f56097b krebs 3: add fastpoke 2015-09-30 11:56:13 +02:00
lassulus
ad5ef39476 Merge branch 'tv' 2015-09-28 18:43:56 +02:00
makefu
d9f4d621bc Reaktor: add extraEnviron for setting Channel 2015-09-27 21:50:40 +02:00
makefu
170191034e add description for sources.dir.*.host 2015-09-27 19:32:27 +02:00
makefu
dec3f4a211 fix wry 2015-09-27 17:27:11 +02:00
tv
9ff5db3fd6 tv: cd, rmdir: add ssh.pubkey 2015-09-27 16:56:14 +02:00
tv
4946561e0a krebs.build.scripts.init: don't try to use privkey
^_^
2015-09-27 16:55:17 +02:00
tv
0e069d964e add krebs.build.scripts.init 2015-09-27 16:37:20 +02:00
tv
48e28c49e0 krebs tv-imp: bump mkdir's addrs4 2015-09-27 16:17:11 +02:00
tv
18cfca4fe8 krebs: set host key for hosts with ssh.privkey 2015-09-27 16:15:53 +02:00
makefu
400dab8254 Merge remote-tracking branch 'cd/master' into before-merge 2015-09-27 15:27:00 +02:00
tv
5a0d8f45c1 krebs tv-imp: add ire 2015-09-27 15:26:04 +02:00
tv
dc5299a071 krebs: add hosts with ssh.pubkey to known hosts 2015-09-27 15:24:41 +02:00
makefu
394408c9b7 3modules: add wry 2015-09-27 15:24:27 +02:00
tv
53f93de02f krebs: no extraHosts for hosts w/o aliases 2015-09-27 15:19:59 +02:00
tv
2d1985e420 infest: don't init contents of the NixOS channel 2015-09-27 15:18:54 +02:00
tv
c9ccf22b15 krebs.build: merge deploy and infest 2015-09-27 00:37:20 +02:00
lassulus
1c6d6918d7 krebs 3: update echelon ip 2015-09-19 23:40:25 +02:00
lassulus
c20e49bd20 krebs 3: update echelon ip 2015-09-18 03:07:13 +02:00
lassulus
ab946ab7c1 add "make infest" 2015-09-18 03:04:39 +02:00
lassulus
e83f8f3baa Merge branch 'makefu' 2015-09-13 16:39:02 +02:00
makefu
2281516e57 retiolum.nix: fix pidfile name 2015-09-09 15:15:22 +02:00
lassulus
95d3ccbc3d Merge branch 'tv' 2015-09-05 12:18:02 +02:00
lassulus
f54a0a9ea7 Merge branch 'makefu' 2015-09-05 12:17:59 +02:00
lassulus
f3c1727659 lass: add echelon 2015-09-05 12:15:31 +02:00
lassulus
9dcea815c6 krebs 3: make rsync work on retarted systems 2015-09-05 12:12:21 +02:00
makefu
6099a42734 Reaktor extraconfig is extensible 2015-09-04 23:01:41 +02:00
makefu
d12e86c481 Reaktor: debug enable/disable 2015-09-04 22:56:15 +02:00
makefu
8012e60b77 krebs/3modules/Reaktor: fix auto startup 2015-09-04 12:37:12 +02:00
tv
b82fd9ba29 krebs tv hosts: add xu 2015-09-04 01:29:32 +02:00
makefu
444dfa388b krebs:add euer.krebsco.de to pigstarter cnames 2015-08-31 21:10:00 +02:00
makefu
3e581053f4 add extraConfig and overrideConfig
this allows of preserving the original config while adding bonus features
2015-08-31 19:55:38 +02:00
makefu
0f50750e25 Reaktor: initial commit at 0.3.5 2015-08-31 14:22:21 +02:00
makefu
2eb8bcf9d1 Merge remote-tracking branch 'cd/master' 2015-08-31 10:47:29 +02:00
tv
5591b1dd12 Z* -> */Z* 2015-08-29 00:58:41 +02:00
tv
81eaf7a9e7 one pkgs to rule them all 2015-08-29 00:20:42 +02:00
tv
144fcda288 {tv,krebs}: import krebs pkgs with lib 2015-08-28 22:27:23 +02:00
tv
f63b27240e Merge remote-tracking branch 'pnp/master' 2015-08-28 21:59:19 +02:00
lassulus
814d685291 Merge branch 'makefu' 2015-08-28 17:37:13 +02:00
makefu
407985695d revert path from cacert to nss-cacert 2015-08-26 17:10:02 +02:00
makefu
4f968b3cc4 krebs/services/makefu: change mail-address 2015-08-25 16:57:57 +02:00
lassulus
65a2d75b14 Merge branch 'makefu' 2015-08-23 16:53:38 +02:00
lassulus
5a1a36e1f2 krebs 3: fix uriel's email 2015-08-20 15:57:36 +02:00
lassulus
0a634d3a99 krebs 3: make uriel secure 2015-08-19 17:54:11 +02:00
Felix Richter
1c3f7610c5 urlwatch: fix ca-bundle path 2015-08-17 23:21:51 +02:00
Felix Richter
d5ffbf54cb services: add new mail 2015-08-17 14:21:40 +02:00
Felix Richter
34d65d2c69 krebs/zones: # is not a comment in dns zones ... 2015-08-17 00:43:44 +02:00
Felix Richter
407c159225 add implementation of /etc/zones/ 2015-08-16 23:58:02 +02:00
tv
b8b2575d83 Merge remote-tracking branch 'mors/master' 2015-08-14 15:51:29 +02:00
tv
e8825282a6 {tv 2 => krebs 3} exim-smarthost 2015-08-14 15:48:17 +02:00
lassulus
f5fa77fb73 krebs 3: add lass's mails 2015-08-14 15:20:53 +02:00
tv
db4b55527d krebs/3: add cd extraZones 2015-08-13 22:31:40 +02:00
tv
69723fdefa Merge remote-tracking branch 'pnp/master' 2015-08-13 22:28:19 +02:00
makefu
d230db96d9 krebs: add extraZones 2015-08-13 20:28:21 +00:00
tv
95d9791e90 Merge remote-tracking branch 'pnp/master' 2015-08-13 17:45:49 +02:00
makefu
bdc58a02f9 krebs: add pigstarter,mail 2015-08-13 17:45:43 +02:00
tv
a33f90358d Merge remote-tracking branch 'pnp/master' 2015-08-13 17:09:56 +02:00
tv
9f92ba455c krebs.exim-retiolum: assert krebs.retiolum.enable 2015-08-13 12:08:36 +02:00
makefu
4366ffd6c5 Merge remote-tracking branch 'cd/master' 2015-08-13 12:06:07 +02:00
tv
6c2c01b5cb {tv 2 => krebs 3}/exim-retiolum 2015-08-13 12:03:27 +02:00
makefu
4d08db7462 Merge remote-tracking branch 'cd/master' 2015-08-13 12:02:38 +02:00
makefu
ab2d3f96be services: add pigstarter 2015-08-13 12:02:26 +02:00
tv
7c578b1cad {tv 2 => krebs 3}/exim-retiolum 2015-08-13 11:50:38 +02:00
makefu
0862e949f6 tsp: 2 cores 2015-08-12 16:58:21 +02:00
makefu
2499c472a0 fix ip of tsp (211 is already in use) 2015-08-05 16:55:10 +02:00
makefu
7d75cf113f fix mkdir /root/root@<host>/secret
previously /root/root@<host>/secret folder was created on the
destination host but /root/secret/ is required.

This commit fixes this behavior and creates the correct folder for
bootstrapping
2015-08-04 14:55:06 +02:00
makefu
00bc48d90f add host tsp (traveling salesman problem) 2015-08-02 23:12:38 +02:00
lassulus
1bf670270c Merge remote-tracking branch 'cd/master' into newmaster2 2015-07-28 23:23:26 +02:00
tv
06cb4d25ef */krebs -> krebs/* 2015-07-28 21:38:22 +02:00