summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-06-13 22:29:16 +0200
committerlassulus <lassulus@lassul.us>2019-06-13 22:29:16 +0200
commitbb466e25aa058c74f720a83ee08687d17888180c (patch)
treee8032dd6a20b463a292eada214123351cde994f4 /krebs/3modules
parent4d76cd771dd3216b54fae54a9caddf71a0b57580 (diff)
parent592d157eba8f1b5ba35f1fca64c2905897468f83 (diff)
Merge remote-tracking branch 'gum/master' into makefu-testmakefu-test
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/external/default.nix4
-rw-r--r--krebs/3modules/external/ssh/0x4a6f.pub1
2 files changed, 5 insertions, 0 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 080c259aa..70c49cfcf 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -487,6 +487,10 @@ in {
mail = "shackspace.de@myvdr.de";
pubkey = ssh-for "ulrich";
};
+ "0x4a6f" = {
+ mail = "0x4a6f@shackspace.de";
+ pubkey = ssh-for "0x4a6f";
+ };
miaoski = {
};
filly = {
diff --git a/krebs/3modules/external/ssh/0x4a6f.pub b/krebs/3modules/external/ssh/0x4a6f.pub
new file mode 100644
index 000000000..1ea084bad
--- /dev/null
+++ b/krebs/3modules/external/ssh/0x4a6f.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMoQSUz0wcV8tnTKsYO3sO6XG6EHap8R63ihfMHkxPS