refactor(unifi): move to utsuho

This commit is contained in:
arcnmx 2024-03-21 08:19:43 -07:00
parent 18f69d3b07
commit a157150956
5 changed files with 19 additions and 13 deletions

View file

@ -9,10 +9,12 @@
keycloak = access.nixosFor "keycloak";
mediabox = access.nixosFor "mediabox";
tei = access.nixosFor "tei";
utsuho = access.nixosFor "utsuho";
inherit (mediabox.services) plex;
inherit (keycloak.services) vouch-proxy;
inherit (tei.services) home-assistant zigbee2mqtt;
inherit (config.services) nginx tailscale;
inherit (utsuho.services) unifi;
inherit (config.services) nginx;
in {
imports = let
inherit (meta) nixos;
@ -53,15 +55,16 @@ in {
};
services.cloudflared = let
inherit (nginx) virtualHosts;
inherit (nginx) virtualHosts defaultHTTPListenPort;
tunnelId = "964121e3-b3a9-4cc1-8480-954c4728b604";
localNginx = "http://localhost:${toString defaultHTTPListenPort}";
in {
tunnels.${tunnelId} = {
default = "http_status:404";
credentialsFile = config.sops.secrets.cloudflared-tunnel-hakurei.path;
ingress = {
${virtualHosts.prox.serverName}.service = "http://localhost";
${virtualHosts.gensokyoZone.serverName}.service = "http://localhost";
${virtualHosts.prox.serverName}.service = localNginx;
${virtualHosts.gensokyoZone.serverName}.service = localNginx;
};
};
};
@ -191,8 +194,8 @@ in {
access.vouch = assert vouch-proxy.enable; {
url = "http://${keycloak.lib.access.hostnameForNetwork.local}:${toString vouch-proxy.settings.vouch.port}";
};
access.unifi = {
host = tei.lib.access.hostnameForNetwork.local;
access.unifi = assert unifi.enable; {
host = utsuho.lib.access.hostnameForNetwork.local;
};
access.freeipa = {
host = "idp.local.${config.networking.domain}";

View file

@ -6,7 +6,6 @@
"/rpool/shared/mosquitto mnt/shared/mosquitto none bind,optional,create=dir",
"/rpool/shared/hass mnt/shared/hass none bind,optional,create=dir",
"/rpool/shared/postgresql mnt/shared/postgresql none bind,optional,create=dir",
"/rpool/shared/unifi mnt/shared/unifi none bind,optional,create=dir",
"/dev/ttyZigbee dev/ttyZigbee none bind,optional,create=file",
"/dev/net/tun dev/net/tun none bind,optional,create=file"
],

View file

@ -17,8 +17,6 @@ in {
nixos.postgres
nixos.nginx
nixos.access.zigbee2mqtt
nixos.access.unifi
nixos.unifi
nixos.mosquitto
nixos.home-assistant
nixos.zigbee2mqtt

View file

@ -11,16 +11,18 @@ in {
nixos.cloudflared
nixos.nginx
nixos.access.unifi
nixos.unifi
];
services.cloudflared = let
tunnelId = "28bcd3fc-3467-4997-806b-546ba9995028";
inherit (config.services) unifi;
in {
tunnels.${tunnelId} = {
default = "http_status:404";
credentialsFile = config.sops.secrets.cloudflared-tunnel-utsuho.path;
ingress = {
${virtualHosts.unifi.serverName} = {
${virtualHosts.unifi.serverName} = assert unifi.enable; {
service = "http://localhost";
};
};
@ -28,9 +30,6 @@ in {
};
services.nginx = {
access.unifi = {
host = tei.lib.access.hostnameForNetwork.local;
};
virtualHosts = {
unifi.proxied.enable = "cloudflared";
};