4 Commits

3 changed files with 13 additions and 24 deletions

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-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI="; hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
}; };
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
} }
''; '';
}; };

View File

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