WIP: router: add configuration for second test router

flake.nix

@@ -43,7 +43,6 @@
       modules = [
         secrix.nixosModules.default
         ./modules
-        ./modules/router
         ./hosts/common.nix
         hostFile
         ./users/cazzzer

hosts/router-1/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../modules/router
     ../hw-vm.nix
   ];
 

hosts/router-2/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../modules/router
     ../hw-vm.nix
   ];
 

hosts/router/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../modules/router
     ./hardware-configuration.nix
     ./private.nix
   ];

modules/router/dns.nix

@@ -80,8 +80,6 @@ in
       "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.12"
       "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::12:1"
 
-      "|hass.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
-
       # Lab DNS rewrites
       "||lab.${domain}^$dnsrewrite=etappi.${sysdomain}"
 

modules/router/services.nix

@@ -60,34 +60,25 @@ in
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
       hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
     };
-    virtualHosts."*.${domain}".extraConfig = ''
+    virtualHosts."grouter.${domain}".extraConfig = ''
       encode
       tls {
           dns cloudflare {env.CF_API_KEY}
           resolvers 1.1.1.1
       }
-
-      @grouter host grouter.${domain}
-      handle @grouter {
-          @grafana path /grafana /grafana/*
-          handle @grafana {
-              reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
-          }
-          redir /adghome /adghome/
-          handle_path /adghome/* {
-              reverse_proxy localhost:${toString config.services.adguardhome.port}
-              basic_auth {
-                  Bob $2a$14$HsWmmzQTN68K3vwiRAfiUuqIjKoXEXaj9TOLUtG2mO1vFpdovmyBy
-              }
-          }
-          handle /* {
-              reverse_proxy localhost:${toString config.services.glance.settings.server.port}
+      @grafana path /grafana /grafana/*
+      handle @grafana {
+          reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
+      }
+      redir /adghome /adghome/
+      handle_path /adghome/* {
+          reverse_proxy localhost:${toString config.services.adguardhome.port}
+          basic_auth {
+              Bob $2a$14$HsWmmzQTN68K3vwiRAfiUuqIjKoXEXaj9TOLUtG2mO1vFpdovmyBy
           }
       }
-
-      @hass host hass.${domain}
-      handle @hass {
-          reverse_proxy homeassistant.4.lab.l.cazzzer.com:8123
+      handle /* {
+          reverse_proxy localhost:${toString config.services.glance.settings.server.port}
       }
     '';
   };

users/cazzzer/default.nix

@@ -5,7 +5,7 @@
     isNormalUser = true;
     description = "Yura";
     group = "cazzzer";
-    extraGroups = [ "wheel" "dialout" ]
+    extraGroups = [ "wheel" ]
       ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]
       ++ lib.optionals config.virtualisation.docker.enable [ "docker" ]
       ++ lib.optionals config.programs.wireshark.enable [ "wireshark" ]