From 2e4266297a5b735639c34a52ec8a21f07512d479 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 24 Dec 2018 15:48:35 +0100
Subject: l wiregrill: remove obsolete ipv4

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

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

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 9d1d56ad..703e54e2 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -91,7 +91,6 @@ in {
         };
         wiregrill = {
           via = internet;
-          ip4.addr = "10.244.1.1";
           ip6.addr = w6 "1";
           aliases = [
             "prism.w"
@@ -99,7 +98,6 @@ in {
           wireguard = {
             pubkey = "oKJotppdEJqQBjrqrommEUPw+VFryvEvNJr/WikXohk=";
             subnets = [
-              "10.244.1.0/24"
               (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
               (krebs.genipv6 "wiregrill" "lass" 0).subnetCIDR
             ];
@@ -474,7 +472,6 @@ in {
     phone = {
       nets = {
         wiregrill = {
-          ip4.addr = "10.244.1.2";
           ip6.addr = w6 "a";
           aliases = [
             "phone.w"
-- 
cgit v1.2.3


From 4c60ad0e085702eb9291c20374f1c80fe5cfa05e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 24 Dec 2018 16:32:19 +0100
Subject: l daedalus: fix typo in ipv6

---
 krebs/3modules/lass/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 703e54e2..018998c9 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -276,7 +276,7 @@ in {
       nets = rec {
         retiolum = {
           ip4.addr = "10.243.133.115";
-          ip6.addr = r6 "dead";
+          ip6.addr = r6 "daed";
           aliases = [
             "daedalus.r"
             "cgit.daedalus.r"
@@ -292,8 +292,14 @@ in {
             -----END RSA PUBLIC KEY-----
           '';
         };
+        wiregrill = {
+          ip6.addr = w6 "daed";
+          aliases = [
+            "dapdalus.w"
+          ];
+          wireguard.pubkey = "ZVTTWbJfe8Oq6E6QW1qgXU91FnkuKDGJO3MF3I3gDFI=";
+        };
       };
-      secure = true;
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5Ovdcsljr5dOl7+2sQNKpGpdX0SlOIuCZKEiWEp8g";
     };
-- 
cgit v1.2.3


From 8b4beb8138aa283f99b0cbb3adb84d08c05aad5a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 25 Dec 2018 14:23:22 +0100
Subject: l daedalus.w: fix alias

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

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

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 018998c9..630c14f1 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -295,7 +295,7 @@ in {
         wiregrill = {
           ip6.addr = w6 "daed";
           aliases = [
-            "dapdalus.w"
+            "daedalus.w"
           ];
           wireguard.pubkey = "ZVTTWbJfe8Oq6E6QW1qgXU91FnkuKDGJO3MF3I3gDFI=";
         };
-- 
cgit v1.2.3