pazpi/nix
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: pazpi:f76e112c1d809b3a3e466a80e081d4be39462374
Branches Tags
pazpi:master
..
compare: pazpi:59e90d54f213ed89b0856d54dc616e62796af022
Branches Tags
pazpi:master

No commits in common. "f76e112c1d809b3a3e466a80e081d4be39462374" and "59e90d54f213ed89b0856d54dc616e62796af022" have entirely different histories.
f76e112c1d ... 59e90d54f2

4 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/caddy/default.nix
View file

@ -177,21 +177,6 @@ in
host = "http://${p.hosts.homeassistant}:8123"; host = "http://${p.hosts.homeassistant}:8123";
domain = p.domains.public; 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"; subdomain = "torrent.ts";
host = "http://qbittorrent.${p.domains.tsDns}:8090"; host = "http://qbittorrent.${p.domains.tsDns}:8090";
@ -217,11 +202,6 @@ in
host = "http://${p.hosts.docker-vm}:6060"; host = "http://${p.hosts.docker-vm}:6060";
domain = p.domains.public; domain = p.domains.public;
} }
{
subdomain = "pulse.ts";
host = "http://${p.hosts.pulse}:7655";
domain = p.domains.public;
}
]; ];
}; };

11
hosts/deployments.nix
View file

@ -7,11 +7,12 @@ let
# Generate complete colmena host configs (imports + deployment) # Generate complete colmena host configs (imports + deployment)
mkColmenaHosts = builtins.mapAttrs (name: cfg: { mkColmenaHosts = builtins.mapAttrs (name: cfg: {
imports = inputs.self.nixosConfigurations.${name}._module.args.modules; imports = inputs.self.nixosConfigurations.${name}._module.args.modules;
deployment = { deployment =
targetHost = hosts.${name} or null; {
tags = cfg.tags; targetHost = hosts.${name} or null;
} tags = cfg.tags;
// (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { }); }
// (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { });
}) hostDefs; }) hostDefs;
in in

6
hosts/parameters.nix
View file

@ -20,9 +20,8 @@ in
plex = "plex.${private-domain}"; plex = "plex.${private-domain}";
docker = "docker.${private-domain}"; docker = "docker.${private-domain}";
colmena = "colmena.${private-domain}"; colmena = "colmena.${private-domain}";
bacco = "bacco.${private-domain}"; pve01 = "bacco${private-domain}";
node = "node.${private-domain}"; pve02 = "node.${private-domain}";
krzo = "krzo.${private-domain}";
dns01 = "192.168.1.2"; dns01 = "192.168.1.2";
dns02 = "192.168.1.3"; dns02 = "192.168.1.3";
shadowsocks = "shadowsocks.${private-domain}"; shadowsocks = "shadowsocks.${private-domain}";
@ -39,7 +38,6 @@ in
actual = "actual-budget.${private-domain}"; actual = "actual-budget.${private-domain}";
karakeep = "karakeep.${private-domain}"; karakeep = "karakeep.${private-domain}";
docker-vm = "docker-vm.${private-domain}"; docker-vm = "docker-vm.${private-domain}";
pulse = "pulse.${private-domain}";
}; };
personal = { personal = {
username = "pazpi"; username = "pazpi";

2
modules/services/nextcloud.nix
View file

@ -65,7 +65,7 @@ in
nextcloud = { nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud33; package = pkgs.nextcloud32;
hostName = "cloud.${cfg.proxy.domain}"; hostName = "cloud.${cfg.proxy.domain}";
https = true; https = true;