Merge remote-tracking branch 'mic92/master' into master

4 files changed, 15 insertions, 0 deletions

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index d1452670..277169e1 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 269c540b..29d0b27f 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 00000000..ed89d702
--- /dev/null
+++ b/krebs/3modules/external/ssh/shannan.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBXTForyB6oNMK5bbGpALKU4lPsKRGxNLhrE/PnHHq7 shannan@bernie
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 944a68be..1206f165 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -392,6 +392,15 @@ with import <stockholm/lib>;
       ];
     }
     {
+      users.users.shannan = {
+        uid = genid_uint31 "shannan";
+        isNormalUser = true;
+        openssh.authorizedKeys.keys = [
+          config.krebs.users.shannan.pubkey
+        ];
+      };
+    }
+    {
       nix.trustedUsers = [ "mic92" ];
       users.users.mic92 = {
         uid = genid_uint31 "mic92";