1 Commits

Author SHA1 Message Date
574ba8a951 pc: move nix store to separate zfs dataset 2025-06-24 00:00:09 -07:00
3 changed files with 17 additions and 23 deletions

View File

@@ -18,6 +18,11 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/nix" =
{ device = "zroot/data/nix";
fsType = "zfs";
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/970C-6A15"; { device = "/dev/disk/by-uuid/970C-6A15";
fsType = "vfat"; fsType = "vfat";

View File

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

View File

@@ -60,34 +60,25 @@ in
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
}; };
virtualHosts."*.${domain}".extraConfig = '' virtualHosts."grouter.${domain}".extraConfig = ''
encode encode
tls { tls {
dns cloudflare {env.CF_API_KEY} dns cloudflare {env.CF_API_KEY}
resolvers 1.1.1.1 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
} }
''; '';
}; };