Unverified Commit b12aaa9f authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #316139 from Luflosi/bind-service-wait-for-ready-status

parents 2b4b32d6 8e945401

nixos/modules/services/networking/bind.nix

+2 −1
Original line number Diff line number Diff line
@@ -271,7 +271,8 @@ in 
      '';



      serviceConfig = {

        ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";

        Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788

        ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}";

        ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";

        ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";

      };

nixos/tests/bind.nix

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import ./make-test-python.nix { 


  testScript = ''

    machine.wait_for_unit("bind.service")

    machine.wait_for_open_port(53)

    machine.succeed("host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org")

  '';

}