diff options
| author | lassulus <lassulus@lassul.us> | 2019-06-15 00:53:40 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-06-15 00:53:40 +0200 |
| commit | cb7fcd8efa81950c97da531757aabdfecb28f2f1 (patch) | |
| tree | e28d793d8291348ccfa02d79003e525fafd4d8cf /krebs/3modules | |
| parent | ec93824f05c8f89e738831c2c059e934cbffafb8 (diff) | |
| parent | df9b3fa1be5eb3e812f605ea78ac3f7363b52211 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/external/default.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/external/ssh/0x4a6f.pub | 1 | ||||
| -rw-r--r-- | krebs/3modules/makefu/wiregrill/gum.pub | 2 | ||||
| -rw-r--r-- | krebs/3modules/makefu/wiregrill/rockit.pub | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index beff63dfa..bdbfd1cb8 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -494,6 +494,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 diff --git a/krebs/3modules/makefu/wiregrill/gum.pub b/krebs/3modules/makefu/wiregrill/gum.pub index 4a5f666cc..67d6c7216 100644 --- a/krebs/3modules/makefu/wiregrill/gum.pub +++ b/krebs/3modules/makefu/wiregrill/gum.pub @@ -1 +1 @@ -yAKvxTvcEVdn+MeKsmptZkR3XSEue+wSyLxwcjBYxxo= +A7UPKSUaCZaJ9hXv6X4jvcZ+5X+PlS1EmCwxlLBAKH0= diff --git a/krebs/3modules/makefu/wiregrill/rockit.pub b/krebs/3modules/makefu/wiregrill/rockit.pub new file mode 100644 index 000000000..6cb0d960d --- /dev/null +++ b/krebs/3modules/makefu/wiregrill/rockit.pub @@ -0,0 +1 @@ +YmvTL4c13WS6f88ZAz2m/2deL2pnPXI0Ay3edCPE1Qc= |