From 950a735472f2b09b08119ba79f10c54a9efb28e6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 3 May 2021 17:59:52 +0200
Subject: l: (re)init echelon.r (with ssh tor unlocking)

---
 krebs/3modules/lass/default.nix | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'krebs/3modules/lass')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 300ea2ccc..d29988be2 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -742,6 +742,46 @@ in {
       syncthing.id = "W5BJ4TL-GAQ46WS-ZB72HFS-XOURLBA-RNBVMYC-POFH4UA-CBORQID-BMIHNQZ";
     };
 
+    echelon = {
+      cores = 1;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.0.3";
+          ip6.addr = r6 "4";
+          aliases = [
+            "echelon.r"
+          ];
+          tinc.pubkey = ''
+            -----BEGIN PUBLIC KEY-----
+            MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxTpl0YvJWiF9cAYeAdp
+            1gG18vrSeYDpmVCsZmxi2qyeWNM4JGSVPYoagyKHSDGH60xvktRh/1Zat+1hHR0A
+            MAjDIENn9hAICQ8lafnm2v3+xzLNoTMJTYG3eba2MlJpAH0rYP0E5xBhQj9DCSAe
+            UpEZWAwCKDCOmg/9h0gvs3kh0HopwjOE1IEzApgg05Yuhna96IATVdBAC7uF768V
+            rJZNkQRvhetGxB459C58uMdcRK3degU6HMpZIXjJk6bqkzKBMm7C3lsAfaWulfez
+            gavFSHC15NbHkz+fcVZNZReJhfTHP7k05xo5vYpDhszdUSjc3MtWBmk5v9zdS1pO
+            c+20a1eurr1EPoYBqjQL0tLBwuQc2tN5XqJKVY5LGAnojAI6ktPKPLR6qZHC4Kna
+            dgJ/S1BzHVxniYh3/rEzhXioneZ6oZgO+65WtsS42WAvh/53U/Q3chgI074Jssze
+            ev09+zU8Xj0vX/7KpRKy5Vln6RGkQbKAIt7TZL5cJALswQDzcCO4WTv1X5KoG3+D
+            KfTMfl9HzFsv59uHKlUqUguN5e8CLdmjgU1v2WvHBCw1PArIE8ZC0Tu2bMi5i9Vq
+            GHxVn9O4Et5yPocyQtE4zOfGfqwR/yNa//Zs1b6DxQ73tq7rbBQaAzq7lxW6Ndbr
+            43jjLL40ONdFxX7qW/DhT9MCAwEAAQ==
+            -----END PUBLIC KEY-----
+          '';
+        };
+        wiregrill = {
+          ip6.addr = w6 "3";
+          aliases = [
+            "echelon.w"
+          ];
+          wireguard.pubkey = ''
+            SLdk0lph2rSFU+3dyrWDU1CT/oU+HPcOVYeGVIgDpEc=
+          '';
+        };
+      };
+      ssh.privkey.path = <secrets/ssh.id_ed25519>;
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIn+o0uCBSot254kZKlNepVKFcwDPdr8s6+lQmYGM3Hd ";
+    };
+
   };
   users = rec {
     lass = lass-yubikey;
-- 
cgit v1.2.3


From eb656a4fe57f0e1bb937c3ef4b4fad530a239b7f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 24 May 2021 22:15:09 +0200
Subject: l: update android pubkey

---
 krebs/3modules/lass/default.nix         | 2 +-
 krebs/3modules/lass/ssh/android.ed25519 | 1 +
 krebs/3modules/lass/ssh/android.rsa     | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 krebs/3modules/lass/ssh/android.ed25519
 delete mode 100644 krebs/3modules/lass/ssh/android.rsa

(limited to 'krebs/3modules/lass')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index d29988be2..cb68cff18 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -807,7 +807,7 @@ in {
     };
     lass-android = {
       mail = "lassulus@gmail.com";
-      pubkey = builtins.readFile ./ssh/android.rsa;
+      pubkey = builtins.readFile ./ssh/android.ed25519;
     };
   };
 }
diff --git a/krebs/3modules/lass/ssh/android.ed25519 b/krebs/3modules/lass/ssh/android.ed25519
new file mode 100644
index 000000000..44f424809
--- /dev/null
+++ b/krebs/3modules/lass/ssh/android.ed25519
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4CYC/CwtLf3U+pTjIvAormpJCvauVUBdHXuD7n2wc3
diff --git a/krebs/3modules/lass/ssh/android.rsa b/krebs/3modules/lass/ssh/android.rsa
deleted file mode 100644
index 21b8e015e..000000000
--- a/krebs/3modules/lass/ssh/android.rsa
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpP5YExkzwfmn7GpvnmZZRx1S+jmZyYrOf7b5cZZnbF
-- 
cgit v1.2.3