external: move users from makefu namespace to external

6 files changed, 23 insertions, 16 deletions

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 39922e2ee..7b651f6f1 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -9,6 +9,7 @@ with import <stockholm/lib>;
     nets.retiolum.ip6.addr =
       (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
   });
+  pub-for = name: builtins.readFile (./ssh + "/${name}.pub");
 
 in {
   hosts = mapAttrs hostDefaults {
@@ -316,19 +317,34 @@ in {
     };
   };
   users = {
-    Mic92 = {
-      pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE";
-      mail = "joerg@higgsboson.tk";
+    ciko = {
+      mail = "wieczorek.stefan@googlemail.com";
+    };
+    exco = {
+      mail = "dickbutt@excogitation.de";
+      pubkey = pub-for "exco";
     };
     kmein = {
     };
-    palo = {
+    Mic92 = {
+      mail = "joerg@higgsboson.tk";
+      pubkey = pub-for "Mic92";
     };
-    sokratess = {
+    palo = {
     };
     qubasa = {
       mail = "luis.nixos@gmail.com";
     };
+    raute = {
+      mail = "macxylo@gmail.com";
+      pubkey = pub-for "raute";
+    };
+    sokratess = {
+    };
+    ulrich = {
+      mail = "shackspace.de@myvdr.de";
+      pubkey = pub-for "ulrich";
+    };
   };
 }
 
diff --git a/krebs/3modules/external/ssh/Mic92.pub b/krebs/3modules/external/ssh/Mic92.pub
new file mode 100644
index 000000000..600709c78
--- /dev/null
+++ b/krebs/3modules/external/ssh/Mic92.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE
diff --git a/krebs/3modules/makefu/ssh/exco.pub b/krebs/3modules/external/ssh/exco.pub
index cab884c0c..cab884c0c 100644
--- a/krebs/3modules/makefu/ssh/exco.pub
+++ b/krebs/3modules/external/ssh/exco.pub
diff --git a/krebs/3modules/external/ssh/raute.pub b/krebs/3modules/external/ssh/raute.pub
new file mode 100644
index 000000000..69b4d3d10
--- /dev/null
+++ b/krebs/3modules/external/ssh/raute.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH385gr3BAKJ92k1FaOLx2wFMgDFTmupOcww5g/bEAsO raute@wolf
diff --git a/krebs/3modules/makefu/ssh/ulrich.pub b/krebs/3modules/external/ssh/ulrich.pub
index 8ac69004c..8ac69004c 100644
--- a/krebs/3modules/makefu/ssh/ulrich.pub
+++ b/krebs/3modules/external/ssh/ulrich.pub
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index befec2156..4fe24025f 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -1079,16 +1079,5 @@ in {
       inherit (makefu) mail pgp;
       pubkey = pub-for "makefu.bob";
     };
-    ciko = {
-      mail = "wieczorek.stefan@googlemail.com";
-    };
-    ulrich = {
-      pubkey = pub-for "ulrich";
-      mail = "shackspace.de@myvdr.de";
-    };
-    exco = {
-      mail = "dickbutt@excogitation.de";
-      pubkey = pub-for "exco";
-    };
   };
 }