public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/unbound: fix define-tag option 

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 6b12cff0b5746af364066d1bcb2bc2563e978aa8)
This commit is contained in:
Marc 'risson' Schmitt 2021-05-28 22:12:47 +02:00 committed by github-actions[bot]
parent 8fe750c560
commit 49cd45c508
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/networking/unbound.nix
View File

@ -21,7 +21,15 @@ let
)) ))
else throw (traceSeq v "services.unbound.settings: unexpected type"); else throw (traceSeq v "services.unbound.settings: unexpected type");
confFile = pkgs.writeText "unbound.conf" (concatStringsSep "\n" ((mapAttrsToList (toConf "") cfg.settings) ++ [""])); confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]);
confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ]));
confFile = pkgs.writeText "unbound.conf" ''
server:
${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)}
${confServer}
${confNoServer}
'';
rootTrustAnchorFile = "${cfg.stateDir}/root.key"; rootTrustAnchorFile = "${cfg.stateDir}/root.key";
@ -170,6 +178,7 @@ in {
# prevent race conditions on system startup when interfaces are not yet # prevent race conditions on system startup when interfaces are not yet
# configured # configured
ip-freebind = mkDefault true; ip-freebind = mkDefault true;
define-tag = mkDefault "";
}; };
remote-control = { remote-control = {
control-enable = mkDefault false; control-enable = mkDefault false;