diff options
| author | TQ Hirsch <thequux@thequux.com> | 2023-06-29 12:42:01 +0200 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-07-01 18:55:51 +0800 |
| commit | dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e (patch) | |
| tree | 8eeb39d8e9f8a0a840558d8944ad0bd72bd73604 | |
| parent | 8ab22ad2ad166a75e517bc3d0a6625d3e3f4517a (diff) | |
| download | nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar.gz nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar.bz2 nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar.lz nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar.xz nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.tar.zst nixpkgs-dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e.zip | |
pdns: Changed paths in /etc to use pdns instead of powerdns
| -rw-r--r-- | nixos/modules/services/networking/pdns-recursor.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/powerdns.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/dns/pdns-recursor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/dns/pdns/default.nix | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index af5ea08a360..f929532ba09 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -159,7 +159,7 @@ in { config = mkIf cfg.enable { - environment.etc."powerdns-recursor".source = configDir; + environment.etc."pdns-recursor".source = configDir; services.pdns-recursor.settings = mkDefaultAttrs { local-address = cfg.dns.address; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index fd82791f21c..03bf93301d8 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -38,7 +38,7 @@ in { config = mkIf cfg.enable { - environment.etc.powerdns.source = finalConfigDir; + environment.etc.pdns.source = finalConfigDir; systemd.packages = [ pkgs.pdns ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index c8da5d9de60..da0890e8e4d 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-reproducible" "--enable-systemd" - "sysconfdir=/etc/powerdns-recursor" + "sysconfdir=/etc/pdns-recursor" ]; - installFlags = [ "sysconfdir=$(out)/etc/powerdns-recursor" ]; + installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index e998a1e5cf9..fcd218a1f3c 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-libsodium" "--with-sqlite3" "--with-libcrypto=${openssl.dev}" - "sysconfdir=/etc/powerdns" + "sysconfdir=/etc/pdns" ]; # nix destroy with-modules arguments, when using configureFlags @@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { ''; # We want the various utilities to look for the powerdns config in - # /etc/powerdns, but to actually install the sample config file in + # /etc/pdns, but to actually install the sample config file in # $out - installFlags = [ "sysconfdir=$(out)/etc/powerdns" ]; + installFlags = [ "sysconfdir=$(out)/etc/pdns" ]; enableParallelBuilding = true; doCheck = true; |