about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2024-03-11 16:06:31 +0100
committerGitHub <noreply@github.com>2024-03-11 16:06:31 +0100
commit869ec01e5668d6d3351d10481e2e6e6a0eeaa59f (patch)
treeac16bcc351d490ac019acbdb94daf762ecc6dd6f /nixos
parentf06705dadc0623ddf38a0e656ff953c962fb6586 (diff)
parent67c1193fab6649cc788641411a64e34ca6ab3672 (diff)
downloadnixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar.gz
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar.bz2
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar.lz
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar.xz
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.tar.zst
nixlib-869ec01e5668d6d3351d10481e2e6e6a0eeaa59f.zip
Merge pull request #294286 from SuperSandro2000/unbound-remote-config-check
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/unbound.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 8438e472e11e..17c6789827b9 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -76,12 +76,13 @@ in {
 
       checkconf = mkOption {
         type = types.bool;
-        default = !cfg.settings ? include;
-        defaultText = "!config.services.unbound.settings ? include";
+        default = !cfg.settings ? include && !cfg.settings ? remote-control;
+        defaultText = "!services.unbound.settings ? include && !services.unbound.settings ? remote-control";
         description = lib.mdDoc ''
           Wether to check the resulting config file with unbound checkconf for syntax errors.
 
-          If settings.include is used, then this options is disabled, as the import can likely not be resolved at build time.
+          If settings.include is used, this options is disabled, as the import can likely not be accessed at build time.
+          If settings.remote-control is used, this option is disabled, too as the control-key-file, server-cert-file and server-key-file cannot be accessed at build time.
         '';
       };