vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(matrix): address argus review — drop in-code issue tag + dead nameservers

Browse source 
- remove the (#1500) issue tag from the resolv.conf source comment
  (no-NNN-in-code rule; context lives in the commit/PR/issue link)
- drop networking.nameservers from the network.enable branch: resolvconf
  is disabled, so nothing reads it to synthesise resolv.conf — the static
  environment.etc."resolv.conf" is the sole source. eval output unchanged
  (nameserver <bridgeIp> + options edns0), confirming it was dead config.
This commit is contained in:
atlas 2026-06-07 22:11:54 +02:00 • committed by mara
commit 0d92a6028c
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/modules/hive-matrix.nix
View file

@ -352,7 +352,7 @@ in
# The earlier fix turned host-tracking off and trusted resolvconf # The earlier fix turned host-tracking off and trusted resolvconf
# to honour `networking.nameservers` — but that's a RUNTIME # to honour `networking.nameservers` — but that's a RUNTIME
# resolvconf behaviour, not verifiable at eval time, and it STILL # resolvconf behaviour, not verifiable at eval time, and it STILL
# came up empty in practice (#1500). So take resolvconf out of the # came up empty in practice. So take resolvconf out of the
# loop entirely and write a STATIC `/etc/resolv.conf` from # loop entirely and write a STATIC `/etc/resolv.conf` from
# `bridgeIp` that nothing regenerates. Eval-proven: the generated # `bridgeIp` that nothing regenerates. Eval-proven: the generated
# `environment.etc."resolv.conf".text` is `nameserver <bridgeIp>`. # `environment.etc."resolv.conf".text` is `nameserver <bridgeIp>`.
@ -362,9 +362,11 @@ in
# resolv.conf. See `docs/network.md`. # resolv.conf. See `docs/network.md`.
networking = lib.mkMerge [ networking = lib.mkMerge [
(lib.mkIf networkCfg.enable { (lib.mkIf networkCfg.enable {
# resolvconf is taken out of the loop entirely; the static
# `environment.etc."resolv.conf"` below is the sole source of
# the resolver file (no `nameservers` — nothing would read it).
useHostResolvConf = lib.mkForce false; useHostResolvConf = lib.mkForce false;
resolvconf.enable = lib.mkForce false; resolvconf.enable = lib.mkForce false;
nameservers = [ networkCfg.bridgeIp ];
}) })
(lib.mkIf (!networkCfg.enable) { (lib.mkIf (!networkCfg.enable) {
useHostResolvConf = true; useHostResolvConf = true;