chore(pcsd): update to latest breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2025-01-19 14:54:24 -05:00
parent 6db3884f23
commit 8327c991fc
7 changed files with 28 additions and 27 deletions

View file

@ -4,7 +4,7 @@ deviceName: {
self, self,
... ...
}: let }: let
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip; clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
in { in {
# ------------------------------------------------ # ------------------------------------------------
# Imports # Imports

View file

@ -6,7 +6,7 @@
self, self,
... ...
}: let }: let
inherit (lib) attrValues removeAttrs; inherit (lib) attrValues head removeAttrs;
inherit (config.sops) secrets; inherit (config.sops) secrets;
inherit (config.networking) hostName; inherit (config.networking) hostName;
@ -34,7 +34,7 @@ in {
}; };
virtualHosts = let virtualHosts = let
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip; clusterIP = (head config.services.pcsd.virtualIps).ip;
nosIP = "10.0.0.121"; nosIP = "10.0.0.121";
serviviIP = "10.0.0.249"; serviviIP = "10.0.0.249";
homieIP = "100.64.0.10"; homieIP = "100.64.0.10";

View file

@ -5,7 +5,7 @@
}: let }: let
inherit (config.networking) hostName; inherit (config.networking) hostName;
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip; clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
in { in {
users.users.${mainUser}.extraGroups = ["headscale"]; users.users.${mainUser}.extraGroups = ["headscale"];

View file

@ -16,45 +16,46 @@ in {
corosyncKeyFile = secrets.corosync.path; corosyncKeyFile = secrets.corosync.path;
clusterUserPasswordFile = secrets.pcs-pass.path; clusterUserPasswordFile = secrets.pcs-pass.path;
virtualIps = { virtualIps = [
"caddy-vip" = { {
id = "caddy-vip";
ip = "10.0.0.130"; ip = "10.0.0.130";
interface = "eno1"; interface = "eno1";
group = "caddy-grp"; group = "caddy-grp";
}; }
}; ];
systemdResources = { systemdResources = [
"unbound" = { {
systemdName = "unbound";
enable = true; enable = true;
group = "caddy-grp"; group = "caddy-grp";
startAfter = ["caddy-vip"]; }
};
"blocky" = { {
systemdName = "blocky";
enable = true; enable = true;
group = "caddy-grp"; group = "caddy-grp";
startAfter = ["unbound"]; }
};
"headscale" = { {
systemdName = "headscale";
enable = true; enable = true;
group = "caddy-grp"; group = "caddy-grp";
startAfter = ["blocky"]; }
};
"caddy" = { {
systemdName = "caddy";
enable = true; enable = true;
group = "caddy-grp"; group = "caddy-grp";
startAfter = ["headscale"]; }
};
"searx" = { {
systemdName = "searx";
enable = true; enable = true;
group = "caddy-grp"; group = "caddy-grp";
startAfter = ["caddy"]; }
}; ];
};
nodes = [ nodes = [
{ {

View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (lib) mapAttrsToList; inherit (lib) head mapAttrsToList;
in { in {
services.searx = { services.searx = {
enable = true; enable = true;
@ -43,7 +43,7 @@ in {
server = { server = {
port = 8080; port = 8080;
bind_address = config.services.pcsd.virtualIps.caddy-vip.ip; bind_address = (head config.services.pcsd.virtualIps).ip;
secret_key = "@SEARXNG_SECRET@"; secret_key = "@SEARXNG_SECRET@";

Binary file not shown.

BIN
flake.nix

Binary file not shown.