Unverified Commit 99d4bf7b authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #218280 from thequux/set-pdns-config-dir 

powerdns, pdns-recursor: find config in /etc by default
parents dd38202c dd481f2e

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

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ in { 


  config = mkIf cfg.enable {



    environment.etc."pdns-recursor".source = configDir;



    services.pdns-recursor.settings = mkDefaultAttrs {

      local-address = cfg.dns.address;

      local-port    = cfg.dns.port;

nixos/modules/services/networking/powerdns.nix

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ in { 


  config = mkIf cfg.enable {



    environment.etc.pdns.source = finalConfigDir;



    systemd.packages = [ pkgs.pdns ];



    systemd.services.pdns = {

nixos/tests/powerdns.nix

+1 −7
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
  };



  testScript = ''

    import re



    with subtest("PowerDNS database exists"):

        server.wait_for_unit("mysql")

        server.succeed("echo 'SHOW DATABASES;' | sudo -u pdns mysql -u pdns >&2")
@@ -46,11 +44,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 


    with subtest("Adding an example zone works"):

        # Extract configuration file needed by pdnsutil

        unit = server.succeed("systemctl cat pdns")

        match = re.search("(--config-dir=[^ ]+)", unit)

        assert(match is not None)

        conf = match.group(1)

        pdnsutil = "sudo -u pdns pdnsutil " + conf

        pdnsutil = "sudo -u pdns pdnsutil "

        server.succeed(f"{pdnsutil} create-zone example.com ns1.example.com")

        server.succeed(f"{pdnsutil} add-record  example.com ns1 A 192.168.1.2")

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

+3 −0
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ stdenv.mkDerivation rec { 
  configureFlags = [

    "--enable-reproducible"

    "--enable-systemd"

    "sysconfdir=/etc/pdns-recursor"

  ];



  installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ];



  enableParallelBuilding = true;



  passthru.tests = {

pkgs/servers/dns/pdns/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "--with-libsodium"

    "--with-sqlite3"

    "--with-libcrypto=${openssl.dev}"

    "sysconfdir=/etc/pdns"

  ];



  # nix destroy with-modules arguments, when using configureFlags
@@ -79,6 +80,11 @@ stdenv.mkDerivation (finalAttrs: { 
    )

  '';



  # We want the various utilities to look for the powerdns config in

  # /etc/pdns, but to actually install the sample config file in

  # $out

  installFlags = [ "sysconfdir=$(out)/etc/pdns" ];



  enableParallelBuilding = true;

  doCheck = true;