router: add host configurations for test routers

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750650909,
+        "lastModified": 1749178927,
-        "narHash": "sha256-HRNJuqo15PRKezyBjhNf2Tjj05EcSJ8q6xJyDDbmDXE=",
+        "narHash": "sha256-bXcEx1aZUNm5hMLVJeuofcOrZyOiapzvQ7K36HYK3YQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "520fc4b50af1b365014c3748c126d3f52edb2f3b",
+        "rev": "91287a0e9d42570754487b7e38c6697e15a9aab2",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750506804,
+        "lastModified": 1748929857,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
         "type": "github"
       },
       "original": {

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
       }
-
+      @grafana path /grafana /grafana/*
-      @grouter host grouter.${domain}
+      handle @grafana {
-      handle @grouter {
+          reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
-          @grafana path /grafana /grafana/*
+      }
-          handle @grafana {
+      redir /adghome /adghome/
-              reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
+      handle_path /adghome/* {
-          }
+          reverse_proxy localhost:${toString config.services.adguardhome.port}
-          redir /adghome /adghome/
+          basic_auth {
-          handle_path /adghome/* {
+              Bob $2a$14$HsWmmzQTN68K3vwiRAfiUuqIjKoXEXaj9TOLUtG2mO1vFpdovmyBy
-              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}
           }
       }
-
+      handle /* {
-      @hass host hass.${domain}
+          reverse_proxy localhost:${toString config.services.glance.settings.server.port}
-      handle @hass {
-          reverse_proxy homeassistant.4.lab.l.cazzzer.com:8123
       }
     '';
   };

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" ]