Merge remote-tracking branch 'lass/master'

3 files changed, 13 insertions, 4 deletions

diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix
index a124d52d8..9f9866c71 100644
--- a/kartei/feliks/default.nix
+++ b/kartei/feliks/default.nix
@@ -93,7 +93,10 @@ in {
     ahuatangata = {
       nets.wiregrill = {
         ip4.addr = "10.244.10.246";
-        aliases = [ "ahuatangata" "ndrd.feliks.r" ];
+        aliases = [
+          "ahuatangata.w"
+          "ndrd.feliks.w"
+        ];
         wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA=";
       };
     };
diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix
index e48b3e32a..bbf6a74f8 100644
--- a/kartei/krebs/default.nix
+++ b/kartei/krebs/default.nix
@@ -165,7 +165,8 @@ in {
       owner = config.krebs.users.krebs;
       extraZones = {
         "krebsco.de" = /* bindzone */ ''
-          krebsco.de. 60 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr}
+          @ IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr}
+          ns1 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr}
         '';
       };
       nets = rec {
@@ -178,6 +179,12 @@ in {
             "ponte.i"
           ];
         };
+        intranet = {
+          ip4 = rec {
+            addr = "10.0.0.234";
+            prefix = "${addr}/24";
+          };
+        };
         retiolum = {
           via = internet;
           ip4.addr = "10.243.4.43";
diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix
index d4806534f..fac48a8ba 100644
--- a/kartei/lass/default.nix
+++ b/kartei/lass/default.nix
@@ -17,9 +17,8 @@ in {
   hosts = lib.mapAttrs (_: lib.recursiveUpdate {
     owner = config.krebs.users.lass;
     consul = true;
-    ci = true;
+    ci = false;
     monitoring = true;
-    ssh.privkey.path = <secrets/ssh.id_ed25519>;
   }) (
     lib.genAttrs hostFiles (host: import (./. + "/${host}.nix") {
       inherit config lib r6 w6;