From 3a35c4c0594c04fb7fa2ec157e9a342e2ffd9fee Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 14 Nov 2022 22:57:52 +0100
Subject: l: init massulus.r

---
 krebs/3modules/lass/default.nix | 50 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

(limited to 'krebs/3modules/lass/default.nix')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 3e58fee1..bb5b1613 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -1,12 +1,6 @@
 with import <stockholm/lib>;
 { config, ... }: let
 
-  hostDefaults = hostName: host: flip recursiveUpdate host {
-    ci = true;
-    monitoring = true;
-    owner = config.krebs.users.lass;
-  };
-
   r6 = ip: (krebs.genipv6 "retiolum" "lass" ip).address;
   w6 = ip: (krebs.genipv6 "wiregrill" "lass" ip).address;
 
@@ -592,6 +586,50 @@ in {
       syncthing.id = "CADHN7J-CWRCWTZ-3GZRLII-JBVZN4N-RGHDGDL-UTAJNYI-RZPHK55-7EYAWQM";
     };
 
+    massulus = {
+      cores = 1;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.0.113";
+          ip6.addr = r6 "113";
+          aliases = [
+            "massulus.r"
+          ];
+          tinc = {
+            pubkey = ''
+              -----BEGIN PUBLIC KEY-----
+              MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApwYalnJ2E1e3WOttPCpt
+              ypNm2adUXS/pejcbF68oRvgv6NRMOKVkoFVEzdnCLYTkYkwcpGd+oRO91F+ekZrN
+              ndEoicuzHNyG6NTXfW3Sjj9Au/NoAVwOJxAztzXMBAsH5pi4PSiqIQZC4l6cyv2K
+              zUNm1LvW5Z5/W0J5XCUw3/B4Py7V/HjW9Yxe8MCaCVVP2kF5SwjmfQ+Yp+8csvU3
+              F30xFjcTJjjWUPSkubgxtsfkrbbjzdMZhKldi3l9LhbYWD8O4bUTrTau/Emaaf6e
+              v5paVh9Kczwg7Ugk9Co3GL4tKOE2I7kRQV2Rg0M5NcRBUwfxkl6JTI2PmY0fNmYd
+              kdLQ1fKlFOrkyHuPBjZET1UniomlLpdycyyZii+YWLoQNj4JlFl8nAlPbqkiy8EF
+              LcHvB2VfdjjyBY25TtYPjFzFsEYKd8HQ7djs8rvJvmhu4tLDD6NaOqJPWMo7I7rW
+              EavQWZd+CELCJNN8eJhYWIGpnq+BI00FKayUAX+OSObYCHD1AikiiIaSjfDCrCJb
+              KVDj/uczOjxHk6TUVbepFA7C8EAxZ01sgHtUDkIfvcDMs4DGn88PmjPW+V/4MfKl
+              oqT7aVv6BYJdSK63rH3Iw+qTvdtzj+vcoO+HmRt2I2Be4ZPSeDrt+riaLycrVF00
+              yFmvsQgi48/0ZSwaVGR8lFUCAwEAAQ==
+              -----END PUBLIC KEY-----
+            '';
+            pubkey_ed25519 = "QwKNyv97Q2/fmPrVkgbGIhDTVW+uKu+F2enGCtZJgkM";
+            port = 1655;
+          };
+        };
+        wiregrill = {
+          ip6.addr = w6 "113";
+          aliases = [
+            "massulus.w"
+          ];
+          wireguard.pubkey = ''
+            4wXpuDBEJS8J1bxS4paz/eZP1MuMfgHDCvOPn4TYtHQ=
+          '';
+        };
+      };
+      ssh.privkey.path = <secrets/ssh.id_ed25519>;
+      ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKH8lFXZ/d2NtqyrpslTGRNBR7FJZCJ6i3UPy0LDl9t7 ";
+    };
+
     phone = {
       nets = {
         wiregrill = {
-- 
cgit v1.2.3


From 25a384254b15433dfeb67ec03ef7416b1baef5df Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 15 Nov 2022 00:02:44 +0100
Subject: l massulus.r: disable ci

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

(limited to 'krebs/3modules/lass/default.nix')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index bb5b1613..dd516428 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -588,6 +588,7 @@ in {
 
     massulus = {
       cores = 1;
+      ci = false;
       nets = {
         retiolum = {
           ip4.addr = "10.243.0.113";
-- 
cgit v1.2.3


From 1db7318c3f4e8a50f07e45ae458ab8fcca6686cb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 15 Nov 2022 15:48:15 +0100
Subject: lib.host: add consul option

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

(limited to 'krebs/3modules/lass/default.nix')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index dd516428..ca0c757a 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -10,6 +10,7 @@ in {
   };
   hosts = mapAttrs (_: recursiveUpdate {
     owner = config.krebs.users.lass;
+    consul = true;
     ci = true;
     monitoring = true;
   }) {
@@ -412,6 +413,7 @@ in {
     };
     xerxes = {
       cores = 2;
+      consul = false;
       nets = rec {
         retiolum = {
           ip4.addr = "10.243.1.3";
@@ -632,6 +634,7 @@ in {
     };
 
     phone = {
+      consul = false;
       nets = {
         wiregrill = {
           ip4.addr = "10.244.1.13";
@@ -647,6 +650,7 @@ in {
       syncthing.id = "PWKVXPB-JCNO6E4-KVIQ7CK-6FSOWHM-AWORMDU-HVVYLKW-44DQTYW-XZT7DQJ";
     };
     tablet = {
+      consul = false;
       nets = {
         wiregrill = {
           ip4.addr = "10.244.1.14";
@@ -661,6 +665,7 @@ in {
       ci = false;
     };
     hilum = {
+      consul = false;
       cores = 1;
       nets = {
         retiolum = {
@@ -836,6 +841,7 @@ in {
     };
 
     lasspi = {
+      consul = false;
       cores = 1;
       nets = {
         retiolum = {
@@ -879,6 +885,7 @@ in {
     };
 
     domsen-pixel = {
+      consul = false;
       nets = {
         wiregrill = {
           ip4.addr = "10.244.1.17";
-- 
cgit v1.2.3