diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 12:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 12:01:22 +0000 |
| commit | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (patch) | |
| tree | f1db5e5b43a05a76c50c83f52c266ac39c128beb /nixos | |
| parent | a57e9fc6c0ae4c349ff0e8c57e1bd56d958ac664 (diff) | |
| parent | 1ae6c6e92104ae774c5d7fb763001ea3d470748e (diff) | |
| download | nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.gz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.bz2 nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.lz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.xz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.zst nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/bind.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 33da4071638..480d5a184f2 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -61,7 +61,7 @@ let blackhole { badnetworks; }; forward first; forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; - directory "/run/named"; + directory "${cfg.directory}"; pid-file "/run/named/named.pid"; ${cfg.extraOptions} }; @@ -166,6 +166,12 @@ in "; }; + directory = mkOption { + type = types.str; + default = "/run/named"; + description = "Working directory of BIND."; + }; + zones = mkOption { default = [ ]; type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions)); @@ -240,6 +246,9 @@ in ${pkgs.coreutils}/bin/mkdir -p /run/named chown ${bindUser} /run/named + + ${pkgs.coreutils}/bin/mkdir -p ${cfg.directory} + chown ${bindUser} ${cfg.directory} ''; serviceConfig = { |