commit a160fa008d586b322e4eb0931557578bf696e8a9 · pyrox.dev/nixpkgs

+10

nixos/doc/manual/release-notes/rl-2103.xml

···

       99
       99
        
             to <literal>/run/pdns-recursor</literal> to match upstream.

     

       100
       100
        
           </para>

     

       101
       101
        
          </listitem>

     

       102
       102
       +
          <listitem>

     

       103
       103
       +
           <para>

     

       104
       104
       +
             PowerDNS has been updated from <literal>4.2.x</literal> to <literal>4.3.x</literal>. Please

     

       105
       105
       +
             be sure to review the <link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#x-to-4-3-0">Upgrade Notes</link>

     

       106
       106
       +
             provided by upstream before upgrading. Worth specifically noting is that the service now runs

     

       107
       107
       +
             entirely as a dedicated <literal>pdns</literal> user, instead of starting as <literal>root</literal>

     

       108
       108
       +
             and dropping privileges, as well as the default <literal>socket-dir</literal> location changing from

     

       109
       109
       +
             <literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.

     

       110
       110
       +
           </para>

     

       111
       111
       +
          </listitem>

     

       102
       112
        
         </itemizedlist>

     

       103
       113
        
        </section>

     

       104
       114

+19 -21

nixos/modules/services/networking/powerdns.nix

···

       8
       8
        
       in {

     

       9
       9
        
         options = {

     

       10
       10
        
           services.powerdns = {

     

       11
       11
       -
             enable = mkEnableOption "Powerdns domain name server";

     

       11
       11
       +
             enable = mkEnableOption "PowerDNS domain name server";

     

       12
       12
        
       

     

       13
       13
        
             extraConfig = mkOption {

     

       14
       14
        
               type = types.lines;

     

       15
       15
        
               default = "launch=bind";

     

       16
       16
        
               description = ''

     

       17
       17
       -
                 Extra lines to be added verbatim to pdns.conf.

     

       18
       18
       -
                 Powerdns will chroot to /var/lib/powerdns.

     

       19
       19
       -
                 So any file, powerdns is supposed to be read,

     

       20
       20
       -
                 should be in /var/lib/powerdns and needs to specified

     

       21
       21
       -
                 relative to the chroot.

     

       17
       17
       +
                 PowerDNS configuration. Refer to

     

       18
       18
       +
                 <link xlink:href="https://doc.powerdns.com/authoritative/settings.html"/>

     

       19
       19
       +
                 for details on supported values.

     

       22
       20
        
               '';

     

       23
       21
        
             };

     

       24
       22
        
           };

     

       25
       23
        
         };

     

       26
       24
        
       

     

       27
       27
       -
         config = mkIf config.services.powerdns.enable {

     

       25
       25
       +
         config = mkIf cfg.enable {

     

       26
       26
       +
       

     

       27
       27
       +
           systemd.packages = [ pkgs.powerdns ];

     

       28
       28
       +
       

     

       28
       29
        
           systemd.services.pdns = {

     

       29
       29
       -
             unitConfig.Documentation = "man:pdns_server(1) man:pdns_control(1)";

     

       30
       30
       -
             description = "Powerdns name server";

     

       31
       30
        
             wantedBy = [ "multi-user.target" ];

     

       32
       32
       -
             after = ["network.target" "mysql.service" "postgresql.service" "openldap.service"];

     

       31
       31
       +
             after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ];

     

       33
       32
        
       

     

       34
       33
        
             serviceConfig = {

     

       35
       35
       -
               Restart="on-failure";

     

       36
       36
       -
               RestartSec="1";

     

       37
       37
       -
               StartLimitInterval="0";

     

       38
       38
       -
               PrivateDevices=true;

     

       39
       39
       -
               CapabilityBoundingSet="CAP_CHOWN CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT";

     

       40
       40
       -
               NoNewPrivileges=true;

     

       41
       41
       -
               ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/powerdns";

     

       42
       42
       -
               ExecStart = "${pkgs.powerdns}/bin/pdns_server --setuid=nobody --setgid=nogroup --chroot=/var/lib/powerdns --socket-dir=/ --daemon=no --guardian=no --disable-syslog --write-pid=no --config-dir=${configDir}";

     

       43
       43
       -
               ProtectSystem="full";

     

       44
       44
       -
               ProtectHome=true;

     

       45
       45
       -
               RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6";

     

       34
       34
       +
               ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];

     

       46
       35
        
             };

     

       47
       36
        
           };

     

       37
       37
       +
       

     

       38
       38
       +
           users.users.pdns = {

     

       39
       39
       +
             isSystemUser = true;

     

       40
       40
       +
             group = "pdns";

     

       41
       41
       +
             description = "PowerDNS";

     

       42
       42
       +
           };

     

       43
       43
       +
       

     

       44
       44
       +
           users.groups.pdns = {};

     

       45
       45
       +
       

     

       48
       46
        
         };

     

       49
       47
        
       }

+56 -4

nixos/tests/powerdns.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       1
       1
       +
       # This test runs PowerDNS authoritative server with the

     

       2
       2
       +
       # generic MySQL backend (gmysql) to connect to a

     

       3
       3
       +
       # MariaDB server using UNIX sockets authentication.

     

       4
       4
       +
       

     

       5
       5
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       6
        
         name = "powerdns";

     

       3
       7
        
       

     

       4
       8
        
         nodes.server = { ... }: {

     

       5
       9
        
           services.powerdns.enable = true;

     

       6
       6
       -
           environment.systemPackages = [ pkgs.dnsutils ];

     

       10
       10
       +
           services.powerdns.extraConfig = ''

     

       11
       11
       +
             launch=gmysql

     

       12
       12
       +
             gmysql-user=pdns

     

       13
       13
       +
           '';

     

       14
       14
       +
       

     

       15
       15
       +
           services.mysql = {

     

       16
       16
       +
             enable = true;

     

       17
       17
       +
             package = pkgs.mariadb;

     

       18
       18
       +
             ensureDatabases = [ "powerdns" ];

     

       19
       19
       +
             ensureUsers = lib.singleton

     

       20
       20
       +
               { name = "pdns";

     

       21
       21
       +
                 ensurePermissions = { "powerdns.*" = "ALL PRIVILEGES"; };

     

       22
       22
       +
               };

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           environment.systemPackages = with pkgs;

     

       26
       26
       +
             [ dnsutils powerdns mariadb ];

     

       7
       27
        
         };

     

       8
       28
        
       

     

       9
       29
        
         testScript = ''

     

       10
       10
       -
           server.wait_for_unit("pdns")

     

       11
       11
       -
           server.succeed("dig version.bind txt chaos \@127.0.0.1")

     

       30
       30
       +
           import re

     

       31
       31
       +
       

     

       32
       32
       +
           with subtest("PowerDNS database exists"):

     

       33
       33
       +
               server.wait_for_unit("mysql")

     

       34
       34
       +
               server.succeed("echo 'SHOW DATABASES;' | sudo -u pdns mysql -u pdns >&2")

     

       35
       35
       +
       

     

       36
       36
       +
           with subtest("Loading the MySQL schema works"):

     

       37
       37
       +
               server.succeed(

     

       38
       38
       +
                   "sudo -u pdns mysql -u pdns -D powerdns <"

     

       39
       39
       +
                   "${pkgs.powerdns}/share/doc/pdns/schema.mysql.sql"

     

       40
       40
       +
               )

     

       41
       41
       +
       

     

       42
       42
       +
           with subtest("PowerDNS server starts"):

     

       43
       43
       +
               server.wait_for_unit("pdns")

     

       44
       44
       +
               server.succeed("dig version.bind txt chaos @127.0.0.1 >&2")

     

       45
       45
       +
       

     

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

     

       47
       47
       +
               # Extract configuration file needed by pdnsutil

     

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

     

       49
       49
       +
               conf = re.search("(--config-dir=[^ ]+)", unit).group(1)

     

       50
       50
       +
               pdnsutil = "sudo -u pdns pdnsutil " + conf

     

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

     

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

     

       53
       53
       +
       

     

       54
       54
       +
           with subtest("Querying the example zone works"):

     

       55
       55
       +
               reply = server.succeed("dig +noall +answer ns1.example.com @127.0.0.1")

     

       56
       56
       +
               assert (

     

       57
       57
       +
                   "192.168.1.2" in reply

     

       58
       58
       +
               ), f""""

     

       59
       59
       +
               The reply does not contain the expected IP address:

     

       60
       60
       +
                 Expected:

     

       61
       61
       +
                   ns1.example.com.        3600    IN      A       192.168.1.2

     

       62
       62
       +
                 Reply:

     

       63
       63
       +
                   {reply}"""

     

       12
       64
        
         '';

     

       13
       65
        
       })

+5 -6

pkgs/servers/dns/powerdns/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, nixosTests

     

       2
       2
        
       , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd

     

       3
       3
       -
       , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC

     

       3
       3
       +
       , mysql57, postgresql, lua, openldap, geoip, curl, unixODBC

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "powerdns";

     

       8
       8
       -
         version = "4.2.3";

     

       8
       8
       +
         version = "4.3.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";

     

       12
       12
       -
           sha256 = "1vf03hssk9rfhvhzfc5ca2r4ly67wq0czr0ysvdrk8pnb0yk6yfi";

     

       12
       12
       +
           sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip

     

       18
       18
       -
           libyamlcpp libsodium curl opendbx unixODBC openssl systemd

     

       18
       18
       +
           libyamlcpp libsodium curl unixODBC openssl systemd

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         # nix destroy with-modules arguments, when using configureFlags

     

       22
       22
        
         preConfigure = ''

     

       23
       23
        
           configureFlagsArray=(

     

       24
       24
       -
             "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"

     

       24
       24
       +
             "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua2 pipe random remote"

     

       25
       25
        
             --with-sqlite3

     

       26
       26
       -
             --with-socketdir=/var/lib/powerdns

     

       27
       26
        
             --with-libcrypto=${openssl.dev}

     

       28
       27
        
             --with-libsodium

     

       29
       28
        
             --enable-tools