diff options
| author | lassulus <lassulus@lassul.us> | 2020-11-24 10:32:53 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-11-24 10:32:53 +0100 |
| commit | 813eefa3c55fd1cd234b0adb1da7286bd761b579 (patch) | |
| tree | 4b98dad3b93ae308b970c2296cc4b2421b15d46f /krebs/3modules | |
| parent | b6ec091cba1ed31dc7c7d1fcb512547a359e0b59 (diff) | |
| parent | ff1d896c8d436cdc83f60f7df7203f38f03fceac (diff) | |
Merge remote-tracking branch 'mic92/master' into master
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/external/default.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/external/mic92.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/external/ssh/shannan.pub | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index d14526703..277169e11 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -608,6 +608,10 @@ in { mail = "joerg@thalheim.io"; pubkey = ssh-for "mic92"; }; + shannan = { + mail = "shannan@lekwati.com"; + pubkey = ssh-for "shannan"; + }; qubasa = { mail = "luis.nixos@gmail.com"; pubkey = ssh-for "qubasa"; diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index 269c540bf..29d0b27fa 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -468,6 +468,7 @@ in { aliases = [ "eva.r" "prometheus.r" + "alertmanager.r" ]; tinc.pubkey = '' -----BEGIN PUBLIC KEY----- diff --git a/krebs/3modules/external/ssh/shannan.pub b/krebs/3modules/external/ssh/shannan.pub new file mode 100644 index 000000000..ed89d702a --- /dev/null +++ b/krebs/3modules/external/ssh/shannan.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBXTForyB6oNMK5bbGpALKU4lPsKRGxNLhrE/PnHHq7 shannan@bernie |