[hosts] use hostId in offsite net

machines/hosts.nix

@@ -3,16 +3,18 @@
 let
   createMaloNet = hostId: mac: {
     local = true;
+    hostId = hostId;
     address = "192.168.1.${hostId}";
     gateway = "192.168.1.1";
     nameservers = [ "192.168.1.17" "1.1.1.1" ]; #setting ns1 as nameserver
     mac = mac;
   };
 
-  createOffsiteNet = address: mac: {
+  createOffsiteNet = hostId: mac: {
     local = false;
-    address = address;
-    gateway = "10.0.10.1";
+    hostId = hostId;
+    address = "10.0.0.${hostId}";
+    gateway = "10.0.0.1";
     nameservers = [ "1.1.1.1" ];
     mac = mac;
   };
@@ -25,6 +27,7 @@ in
         type = "host";
         network = {
           local = true;
+          hostId = "11";
           address = "192.168.1.11";
         };
       };
@@ -33,6 +36,7 @@ in
         type = "host";
         network = {
           local = true;
+          hostId = "12";
           address = "192.168.1.12";
         };
       };
@@ -41,6 +45,7 @@ in
         type = "host";
         network = {
           local = true;
+          hostId = "13";
           address = "192.168.1.13";
         };
       };
@@ -49,6 +54,7 @@ in
         type = "rpi";
         network = {
           local = true;
+          hostId = "15";
           address = "192.168.1.15";
         };
       };
@@ -60,7 +66,7 @@ in
   
       vpn = {
         type = "microvm";
-        network = createOffsiteNet "10.0.0.10" "52:DA:0D:F9:EF:E6";
+        network = createOffsiteNet "10" "52:DA:0D:F9:EF:E6";
       };
   
       infradocs = {
@@ -70,7 +76,7 @@ in
   
       uptimekuma = {
         type = "microvm";
-        network = createOffsiteNet "10.0.0.12" "52:DA:0D:F9:EF:E8";
+        network = createOffsiteNet "12" "52:DA:0D:F9:EF:E8";
       };
   
       nextcloud = {

machines/modules/host_builder.nix

@@ -165,6 +165,16 @@ rec {
       });
     };
 
+    systemd.network.networks."20-lan" = pkgs.lib.mkForce {
+      matchConfig.Type = "ether";
+      networkConfig = {
+        Address = [ "10.0.0.${hosts.malobeo.hosts.${hostname}.network.hostId}/24" ];
+        Gateway = "10.0.0.1";
+        DNS = [ "1.1.1.1" ];
+        DHCP = "no";
+      };
+    };
+
     boot.isContainer = pkgs.lib.mkForce false;
     services.timesyncd.enable = false;
     users.users.root.password = "";

machines/modules/malobeo/zones.nix

@@ -11,7 +11,7 @@ in
   SOA = {
     nameServer = "ns1";
     adminEmail = "admin@malobeo.org";
-    serial = 2019030800;
+    serial = 2019030801;
   };
   useOrigin = false;
 
@@ -19,11 +19,13 @@ in
     "ns1.malobeo.org."
   ];
 
-  A = [ "23.23.23.23" ]; #TODO: update
-  AAAA = [ "4321:0:1:2:3:4:567:89ab" ]; #TODO: update
-
   subdomains = {
+    ns1 = {
+      A = [ hosts.ns1.network.address ];
+    };
+
     ${localNS} = {
+      A = [ hosts.fanny.network.address ];
       subdomains = builtins.mapAttrs (name: value: if value.network.local == true then {
         A = [ value.network.address ];
       } else {}) hosts;

machines/ns1/configuration.nix

@@ -19,8 +19,26 @@ in
     ../modules/autoupdate.nix
   ];
 
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 53 ];
+    allowedUDPPorts = [ 53 ];
+  };
+
   services.bind = {
     enable = true;
+    forwarders = [
+      "1.1.1.1"
+      "1.0.0.1"
+    ];
+  
+    cacheNetworks = [
+      "127.0.0.0/24"
+      "10.0.0.0/24"
+      "192.168.1.0/24"
+      "10.100.0.0/24"
+    ];
+
     zones = {
       "malobeo.org" = {
         master = true;