From 0e62d650cf7f1f0ba50eda6f493db6d02d671b08 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 18 Apr 2023 20:11:38 +0200
Subject: kartei/feliks: init ahuatangata

---
 kartei/feliks/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'kartei/feliks/default.nix')

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index 33f7f9663..88b37cbd5 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -7,6 +7,9 @@ with import ../../lib;
   } // optionalAttrs (host.nets?retiolum) {
     nets.retiolum.ip6.addr =
       (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
+  } // optionalAttrs (host.nets?wiregrill) {
+    nets.wiregrill.ip6.addr =
+      (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
   });
 in {
   users.feliks = {
@@ -18,7 +21,7 @@ in {
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.243";
-          aliases = [ "papawhakaaro.r" ];
+          aliases = [ "papawhakaaro.r" "tp.feliks.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
             MIICCgKCAgEA4bd0lVUVlzFmM8TuH77C5VctcK4lkw02LbMVQDJ5U+Ww075nNahw
@@ -43,7 +46,7 @@ in {
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.244";
-          aliases = [ "iti.r" ];
+          aliases = [ "iti.r" "ltd.feliks.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
             MIICCgKCAgEA5TXEmw3F3lCekITBPW8QYF1ciKHN8RSi47k1vW+jXb6gdWcVo5KL
@@ -68,7 +71,7 @@ in {
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.245";
-          aliases = [ "tumaukainga.r" ];
+          aliases = [ "tumaukainga.r" "hs.feliks.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
             MIICCgKCAgEAj1q28QzUlag0i+2ZEpZyQEbrtuODj6pCCt2IX1Uz1B83outO2l/n
@@ -88,5 +91,11 @@ in {
         };
       };
     };
+    ahuatangata = {
+      nets.wiregrill = {
+        aliases = [ "ahuatangata" "ndrd.feliks.r" ];
+        wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU=";
+      };
+    };
   };
 }
-- 
cgit v1.2.3


From cc46eddcd82227dbc1080005efbd79ac24cf8dab Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 18 Apr 2023 22:34:45 +0200
Subject: kartei/feliks: add ip4 to ahuatangata

---
 kartei/feliks/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'kartei/feliks/default.nix')

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index 88b37cbd5..97fc27fad 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -93,6 +93,7 @@ in {
     };
     ahuatangata = {
       nets.wiregrill = {
+        ip4.addr = "10.243.10.246";
         aliases = [ "ahuatangata" "ndrd.feliks.r" ];
         wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU=";
       };
-- 
cgit v1.2.3


From 48469cc891e2e621bcce6fbd529124d5a93f7cf7 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 18 Apr 2023 22:46:39 +0200
Subject: kartei/feliks: fix wiregrill pubkey

---
 kartei/feliks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kartei/feliks/default.nix')

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index 97fc27fad..58a3e2498 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -95,7 +95,7 @@ in {
       nets.wiregrill = {
         ip4.addr = "10.243.10.246";
         aliases = [ "ahuatangata" "ndrd.feliks.r" ];
-        wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU=";
+        wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA=";
       };
     };
   };
-- 
cgit v1.2.3


From 84ccb812a3c76b6f56e7173bcab7bed7907a0ddf Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Tue, 18 Apr 2023 23:07:48 +0200
Subject: ahuatangata.r: fix ipv4 range

---
 kartei/feliks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kartei/feliks/default.nix')

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index 58a3e2498..0e68d3980 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -93,7 +93,7 @@ in {
     };
     ahuatangata = {
       nets.wiregrill = {
-        ip4.addr = "10.243.10.246";
+        ip4.addr = "10.244.10.246";
         aliases = [ "ahuatangata" "ndrd.feliks.r" ];
         wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA=";
       };
-- 
cgit v1.2.3


From 4bf2909be3afb5e834cacdb4d6f949e4dd78400e Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 23 Apr 2023 14:07:55 +0200
Subject: kartei feliks: define owner for all hosts

---
 kartei/feliks/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'kartei/feliks/default.nix')

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index 0e68d3980..e98da7bc6 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -1,6 +1,7 @@
 with import ../../lib;
 { config, ... }: let
   hostDefaults = hostName: host: flip recursiveUpdate host ({
+    owner = config.krebs.users.feliks;
     ci = false;
     external = true;
     monitoring = false;
@@ -17,7 +18,6 @@ in {
   };
   hosts = mapAttrs hostDefaults {
     papawhakaaro = {
-      owner = config.krebs.users.feliks;
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.243";
@@ -42,7 +42,6 @@ in {
       };
     };
     iti = {
-      owner = config.krebs.users.feliks;
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.244";
@@ -67,7 +66,6 @@ in {
       };
     };
     tumaukainga = {
-      owner = config.krebs.users.feliks;
       nets = {
         retiolum = {
           ip4.addr = "10.243.10.245";
-- 
cgit v1.2.3