Unverified Commit dd481f2e authored by TQ Hirsch's avatar TQ Hirsch Committed by Nick Cao
Browse files

pdns: Changed paths in /etc to use pdns instead of powerdns

parent 8ab22ad2

nixos/modules/services/networking/pdns-recursor.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

nixos/modules/services/networking/powerdns.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ in { 


  config = mkIf cfg.enable {



    environment.etc.powerdns.source = finalConfigDir;

    environment.etc.pdns.source = finalConfigDir;



    systemd.packages = [ pkgs.pdns ];

pkgs/servers/dns/pdns-recursor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/servers/dns/pdns/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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;