sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

18
hosts/ward/guests/adguardhome.nix
View file

@ -1,7 +1,7 @@
{
config,
globals,
lib,
nodes,
pkgs,
...
}: let
@ -12,9 +12,8 @@ in {
firewallRuleForNode.sentinel.allowedTCPPorts = [config.services.adguardhome.port];
};
globals.services.adguardhome.domain = adguardhomeDomain;
nodes.sentinel = {
networking.providedDomains.adguard = adguardhomeDomain;
services.nginx = {
upstreams.adguardhome = {
servers."${config.wireguard.proxy-sentinel.ipv4}:${toString config.services.adguardhome.port}" = {};
@ -78,7 +77,7 @@ in {
# Undo the /etc/hosts entry so we don't answer with the internal
# wireguard address for influxdb
{
domain = nodes.sentinel.config.networking.providedDomains.influxdb;
inherit (globals.services.influxdb) domain;
answer = config.repo.secrets.global.domains.me;
}
]
@ -87,11 +86,12 @@ in {
inherit domain;
answer = "192.168.1.4";
}) [
nodes.sentinel.config.networking.providedDomains.grafana
nodes.sentinel.config.networking.providedDomains.immich
nodes.sentinel.config.networking.providedDomains.influxdb
nodes.sentinel.config.networking.providedDomains.loki
nodes.sentinel.config.networking.providedDomains.paperless
# FIXME: dont hardcode, filter global service domains by internal state
globals.services.grafana.domain
globals.services.immich.domain
globals.services.influxdb.domain
globals.services.loki.domain
globals.services.paperless.domain
"home.${config.repo.secrets.global.domains.me}"
"fritzbox.${config.repo.secrets.global.domains.me}"
];