diff --git a/hosts/caddy/default.nix b/hosts/caddy/default.nix index 17d50eb..6a1576f 100644 --- a/hosts/caddy/default.nix +++ b/hosts/caddy/default.nix @@ -177,21 +177,6 @@ in host = "http://${p.hosts.homeassistant}:8123"; domain = p.domains.public; } - { - subdomain = "bacco.ts"; - host = "https://${p.hosts.bacco}:8006"; - domain = p.domains.public; - } - { - subdomain = "krzo.ts"; - host = "https://${p.hosts.krzo}:8006"; - domain = p.domains.public; - } - { - subdomain = "node.ts"; - host = "https://${p.hosts.node}:8006"; - domain = p.domains.public; - } { subdomain = "torrent.ts"; host = "http://qbittorrent.${p.domains.tsDns}:8090"; @@ -217,11 +202,6 @@ in host = "http://${p.hosts.docker-vm}:6060"; domain = p.domains.public; } - { - subdomain = "pulse.ts"; - host = "http://${p.hosts.pulse}:7655"; - domain = p.domains.public; - } ]; }; diff --git a/hosts/deployments.nix b/hosts/deployments.nix index bb6f921..9eccfb3 100644 --- a/hosts/deployments.nix +++ b/hosts/deployments.nix @@ -7,11 +7,12 @@ let # Generate complete colmena host configs (imports + deployment) mkColmenaHosts = builtins.mapAttrs (name: cfg: { imports = inputs.self.nixosConfigurations.${name}._module.args.modules; - deployment = { - targetHost = hosts.${name} or null; - tags = cfg.tags; - } - // (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { }); + deployment = + { + targetHost = hosts.${name} or null; + tags = cfg.tags; + } + // (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { }); }) hostDefs; in diff --git a/hosts/parameters.nix b/hosts/parameters.nix index 45ffd5c..d031c4b 100644 --- a/hosts/parameters.nix +++ b/hosts/parameters.nix @@ -20,9 +20,8 @@ in plex = "plex.${private-domain}"; docker = "docker.${private-domain}"; colmena = "colmena.${private-domain}"; - bacco = "bacco.${private-domain}"; - node = "node.${private-domain}"; - krzo = "krzo.${private-domain}"; + pve01 = "bacco${private-domain}"; + pve02 = "node.${private-domain}"; dns01 = "192.168.1.2"; dns02 = "192.168.1.3"; shadowsocks = "shadowsocks.${private-domain}"; @@ -39,7 +38,6 @@ in actual = "actual-budget.${private-domain}"; karakeep = "karakeep.${private-domain}"; docker-vm = "docker-vm.${private-domain}"; - pulse = "pulse.${private-domain}"; }; personal = { username = "pazpi"; diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 2dff4ea..a0c1331 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -65,7 +65,7 @@ in nextcloud = { enable = true; - package = pkgs.nextcloud33; + package = pkgs.nextcloud32; hostName = "cloud.${cfg.proxy.domain}"; https = true;