Compare commits

...

3 Commits

2 changed files with 24 additions and 12 deletions

View File

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

View File

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