mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

refactor: get rid of providedDomains in favor of globals

Browse source
This commit is contained in:
oddlama 2024-06-02 16:59:14 +02:00
parent b6cd74c732
commit 68b12b865c
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
31 changed files with 103 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/default.nix
View file

@ -15,7 +15,6 @@
./netbird-client.nix
./oauth2-proxy.nix
./promtail.nix
./provided-domains.nix
./secrets.nix
./telegraf.nix
];

1
modules/distributed-config.nix
View file

@ -40,7 +40,6 @@
forwardedOptions = [
["age" "secrets"]
["networking" "providedDomains"]
["networking" "nftables" "chains"]
["services" "nginx" "upstreams"]
["services" "nginx" "virtualHosts"]

3
modules/promtail.nix
View file

@ -3,6 +3,7 @@
lib,
minimal,
nodes,
globals,
...
}: let
inherit
@ -48,7 +49,7 @@ in {
{
basic_auth.username = "${config.node.name}+promtail-loki-basic-auth-password";
basic_auth.password_file = config.age.secrets.promtail-loki-basic-auth-password.path;
url = "https://${nodes.${cfg.proxy}.config.networking.providedDomains.loki}/loki/api/v1/push";
url = "https://${globals.services.loki.domain}/loki/api/v1/push";
}
];

7
modules/provided-domains.nix
View file

@ -1,7 +0,0 @@
{lib, ...}: {
options.networking.providedDomains = lib.mkOption {
type = lib.types.attrsOf lib.types.str;
default = {};
description = "Registry of domains that this host 'provides' (that refer to this host with some functionality). For easy cross-node referencing.";
};
}