modules/router/dns.nix

@@ -80,14 +80,11 @@ 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}"
 
       # Allowed exceptions
       "@@||googleads.g.doubleclick.net"
-      "@@||stats.grafana.org"
     ]
       # Alpina DNS rewrites
       ++ map (host: "${host}${domain}^$dnsrewrite=debbi.${sysdomain}") alpinaDomains;

modules/router/services.nix

@@ -60,34 +60,25 @@ in
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
       hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
     };
-    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
       }
     '';
   };