feat: remove old "freeform" globals and use new structured globals

This commit is contained in:
oddlama 2024-07-31 15:49:44 +02:00
parent 4e717fab96
commit a128dd5f40
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
35 changed files with 214 additions and 59 deletions

View file

@ -1,5 +1,9 @@
{config, ...}: let
openWebuiDomain = "chat.${config.repo.secrets.global.domains.me}";
{
config,
globals,
...
}: let
openWebuiDomain = "chat.${globals.domains.me}";
in {
microvm.mem = 1024 * 16;
microvm.vcpu = 20;
@ -76,7 +80,7 @@ in {
oauth2 = {
enable = true;
allowedGroups = ["access_openwebui"];
X-Email = "\${upstream_http_x_auth_request_preferred_username}@${config.repo.secrets.global.domains.personal}";
X-Email = "\${upstream_http_x_auth_request_preferred_username}@${globals.domains.personal}";
};
extraConfig = ''
client_max_body_size 128M;

View file

@ -6,7 +6,7 @@
...
}: let
wardWebProxyCfg = nodes.ward-web-proxy.config;
grafanaDomain = "grafana.${config.repo.secrets.global.domains.me}";
grafanaDomain = "grafana.${globals.domains.me}";
in {
wireguard.proxy-sentinel = {
client.via = "sentinel";

View file

@ -7,7 +7,7 @@
}: let
sentinelCfg = nodes.sentinel.config;
wardWebProxyCfg = nodes.ward-web-proxy.config;
immichDomain = "immich.${config.repo.secrets.global.domains.me}";
immichDomain = "immich.${globals.domains.me}";
ipImmichMachineLearning = "10.89.0.10";
ipImmichPostgres = "10.89.0.12";

View file

@ -1,5 +1,6 @@
{
config,
globals,
lib,
nodes,
pkgs,
@ -7,7 +8,7 @@
}: let
sentinelCfg = nodes.sentinel.config;
wardCfg = nodes.ward.config;
influxdbDomain = "influxdb.${config.repo.secrets.global.domains.me}";
influxdbDomain = "influxdb.${globals.domains.me}";
influxdbPort = 8086;
in {
wireguard.proxy-sentinel = {

View file

@ -1,11 +1,12 @@
{
config,
globals,
nodes,
...
}: let
sentinelCfg = nodes.sentinel.config;
wardWebProxyCfg = nodes.ward-web-proxy.config;
lokiDomain = "loki.${config.repo.secrets.global.domains.me}";
lokiDomain = "loki.${globals.domains.me}";
in {
wireguard.proxy-sentinel = {
client.via = "sentinel";

View file

@ -1,13 +1,14 @@
# FIXME: todo: host the proxy on sentinel so the IPs are not lost in natting
{
config,
pkgs,
globals,
lib,
pkgs,
...
}: let
inherit (lib) getExe;
minecraftDomain = "mc.${config.repo.secrets.global.domains.me}";
minecraftDomain = "mc.${globals.domains.me}";
dataDir = "/var/lib/minecraft";
minecraft-attach = pkgs.writeShellApplication {

View file

@ -8,7 +8,7 @@
}: let
sentinelCfg = nodes.sentinel.config;
wardWebProxyCfg = nodes.ward-web-proxy.config;
paperlessDomain = "paperless.${config.repo.secrets.global.domains.me}";
paperlessDomain = "paperless.${globals.domains.me}";
paperlessBackupDir = "/var/cache/paperless-backup";
in {
microvm.mem = 1024 * 9;