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

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";

krebs/3modules/external/mic92.nix

@@ -468,6 +468,7 @@ in {
           aliases = [
             "eva.r"
             "prometheus.r"
+            "alertmanager.r"
           ];
           tinc.pubkey = ''
             -----BEGIN PUBLIC KEY-----

krebs/3modules/external/ssh/shannan.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOBXTForyB6oNMK5bbGpALKU4lPsKRGxNLhrE/PnHHq7 shannan@bernie

lass/1systems/prism/config.nix

@@ -391,6 +391,15 @@ with import <stockholm/lib>;
          { predicate = "-i wiregrill -p udp --dport 4000:4002"; target = "ACCEPT"; }
       ];
     }
+    {
+      users.users.shannan = {
+        uid = genid_uint31 "shannan";
+        isNormalUser = true;
+        openssh.authorizedKeys.keys = [
+          config.krebs.users.shannan.pubkey
+        ];
+      };
+    }
     {
       nix.trustedUsers = [ "mic92" ];
       users.users.mic92 = {