From dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e Mon Sep 17 00:00:00 2001
From: TQ Hirsch <thequux@thequux.com>
Date: Thu, 29 Jun 2023 12:42:01 +0200
Subject: [PATCH] pdns: Changed paths in /etc to use pdns instead of powerdns

---
 nixos/modules/services/networking/pdns-recursor.nix | 2 +-
 nixos/modules/services/networking/powerdns.nix      | 2 +-
 pkgs/servers/dns/pdns-recursor/default.nix          | 4 ++--
 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 af5ea08a3609..f929532ba09f 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 fd82791f21c1..03bf93301d85 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 c8da5d9de60c..da0890e8e4d0 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 e998a1e5cf98..fcd218a1f3cc 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;