diff options
| author | tv <tv@krebsco.de> | 2026-01-13 12:06:20 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2026-01-13 12:06:20 +0100 |
| commit | c4fdf8f07d9109d94450890a75832ddf8e7ed2ec (patch) | |
| tree | 35cb9e422ba37dca3cb79a31b40fa8c0327b65d0 /krebs/3modules | |
| parent | b098f753a53b88c17f1674bacce9533195e88216 (diff) | |
| parent | 2772413f6c0f8466d07775f40b48447ac8a0501b (diff) | |
Merge remote-tracking branch 'krebs/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/ci/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/tinc.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/krebs/3modules/ci/default.nix b/krebs/3modules/ci/default.nix index 899db45c5..1f029276a 100644 --- a/krebs/3modules/ci/default.nix +++ b/krebs/3modules/ci/default.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }: -with lib.slib or (import ../../lib/pure.nix { inherit lib; }); +with lib.slib or (import ../../../lib/pure.nix { inherit lib; }); let cfg = config.krebs.ci; diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index debbb184b..02b3eeb9d 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -91,7 +91,7 @@ with lib.slib or (import ../../lib/pure.nix { inherit lib; }); { hosts = mkOption { type = with types; attrsOf host; default = - filterAttrs (_: h: hasAttr tinc.config.netname h.nets) config.krebs.hosts; + filterAttrs (_: h: hasAttr tinc.config.netname h.nets && h.nets.${tinc.config.netname}.tinc.config or null != null) config.krebs.hosts; defaultText = "‹all-hosts-of-‹netname››"; description = '' Hosts to generate <literal>config.krebs.tinc.retiolum.hostsPackage</literal>. |