peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: simplify DNS configuration for vhosts with dynamic interface detection

Browse Source
This commit is contained in:
Giulio De Pasquale (aider) 2025-04-26 17:31:07 +01:00
parent 301629243e
commit 1a54c00cc2
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/architect/dns.nix
View File

@ -13,8 +13,7 @@
};
# Configure AdGuard
pepe.core.vhost.hosts."adguard.giugl.io" = with config.pepe.core.network; {
dnsInterfaces = [ interfacesByType.vpn interfacesByType.lan ];
pepe.core.vhost.hosts."adguard.giugl.io" = {
locations."/" = {
port = config.services.adguardhome.port;
allowLAN = true;

20
modules/core/vhost.nix
View File

@ -1,7 +1,7 @@
{ config, lib, ... }:
let
inherit (lib) mkOption types mapAttrs concatMapStringsSep optionalString;
inherit (lib) mkOption types mapAttrs concatMapStringsSep optionalString mkIf;
cfg = config.pepe.core.vhost;
in
{
@ -9,13 +9,6 @@ in
hosts = mkOption {
type = types.attrsOf (types.submodule {
options = {
dnsInterfaces = mkOption {
type = types.listOf types.str;
default = [ ];
description = "List of interfaces to add extra DNS hosts for this vhost.";
example = "config.pepe.core.network.interfaceTypes.lan";
};
locations = mkOption {
type = types.attrsOf (types.submodule {
options = {
@ -88,6 +81,17 @@ in
};
config = {
# Configure DNS entries for vhosts when DNS is enabled
pepe.core.dns = mkIf config.pepe.core.dns.enable {
extraDomains = mapAttrs (domain: conf: {
dnsInterfaces =
(lib.optionals (lib.any (loc: loc.allowLAN) (lib.attrValues conf.locations))
config.pepe.core.network.interfacesByType.lan) ++
(lib.optionals (lib.any (loc: loc.allowVPN) (lib.attrValues conf.locations))
config.pepe.core.network.interfacesByType.vpn);
}) cfg.hosts;
};
services.nginx.virtualHosts = mapAttrs
(domain: conf: {
forceSSL = true;