chore(pcsd): update to latest breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
6db3884f23
commit
8327c991fc
7 changed files with 28 additions and 27 deletions
|
@ -4,7 +4,7 @@ deviceName: {
|
|||
self,
|
||||
...
|
||||
}: let
|
||||
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
|
||||
clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
|
||||
in {
|
||||
# ------------------------------------------------
|
||||
# Imports
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
self,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) attrValues removeAttrs;
|
||||
inherit (lib) attrValues head removeAttrs;
|
||||
|
||||
inherit (config.sops) secrets;
|
||||
inherit (config.networking) hostName;
|
||||
|
@ -34,7 +34,7 @@ in {
|
|||
};
|
||||
|
||||
virtualHosts = let
|
||||
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
|
||||
clusterIP = (head config.services.pcsd.virtualIps).ip;
|
||||
nosIP = "10.0.0.121";
|
||||
serviviIP = "10.0.0.249";
|
||||
homieIP = "100.64.0.10";
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
}: let
|
||||
inherit (config.networking) hostName;
|
||||
|
||||
clusterIP = config.services.pcsd.virtualIps.caddy-vip.ip;
|
||||
clusterIP = (builtins.head config.services.pcsd.virtualIps).ip;
|
||||
in {
|
||||
users.users.${mainUser}.extraGroups = ["headscale"];
|
||||
|
||||
|
|
|
@ -16,45 +16,46 @@ in {
|
|||
corosyncKeyFile = secrets.corosync.path;
|
||||
clusterUserPasswordFile = secrets.pcs-pass.path;
|
||||
|
||||
virtualIps = {
|
||||
"caddy-vip" = {
|
||||
virtualIps = [
|
||||
{
|
||||
id = "caddy-vip";
|
||||
ip = "10.0.0.130";
|
||||
interface = "eno1";
|
||||
group = "caddy-grp";
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
systemdResources = {
|
||||
"unbound" = {
|
||||
systemdResources = [
|
||||
{
|
||||
systemdName = "unbound";
|
||||
enable = true;
|
||||
group = "caddy-grp";
|
||||
startAfter = ["caddy-vip"];
|
||||
};
|
||||
}
|
||||
|
||||
"blocky" = {
|
||||
{
|
||||
systemdName = "blocky";
|
||||
enable = true;
|
||||
group = "caddy-grp";
|
||||
startAfter = ["unbound"];
|
||||
};
|
||||
}
|
||||
|
||||
"headscale" = {
|
||||
{
|
||||
systemdName = "headscale";
|
||||
enable = true;
|
||||
group = "caddy-grp";
|
||||
startAfter = ["blocky"];
|
||||
};
|
||||
}
|
||||
|
||||
"caddy" = {
|
||||
{
|
||||
systemdName = "caddy";
|
||||
enable = true;
|
||||
group = "caddy-grp";
|
||||
startAfter = ["headscale"];
|
||||
};
|
||||
}
|
||||
|
||||
"searx" = {
|
||||
{
|
||||
systemdName = "searx";
|
||||
enable = true;
|
||||
group = "caddy-grp";
|
||||
startAfter = ["caddy"];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
nodes = [
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mapAttrsToList;
|
||||
inherit (lib) head mapAttrsToList;
|
||||
in {
|
||||
services.searx = {
|
||||
enable = true;
|
||||
|
@ -43,7 +43,7 @@ in {
|
|||
|
||||
server = {
|
||||
port = 8080;
|
||||
bind_address = config.services.pcsd.virtualIps.caddy-vip.ip;
|
||||
bind_address = (head config.services.pcsd.virtualIps).ip;
|
||||
|
||||
secret_key = "@SEARXNG_SECRET@";
|
||||
|
||||
|
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
Loading…
Reference in a new issue