Unverified Commit 78ec47fd authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

[Backport release-25.11] pihole-ftl: fix `useDnsmasqConfig = true` and add test (#465276)

parents ffc5c458 0a75b5ec

nixos/modules/services/networking/dnsmasq.nix

+2 −2
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ in 
      configFile = lib.mkOption {

        type = lib.types.package;

        readOnly = true;

        default = dnsmasqConf;

        defaultText = lib.literalExpression "Path of dnsmasq config file";

        description = ''

          Path to the configuration file of dnsmasq.

        '';
@@ -137,8 +139,6 @@ in 
        conf-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf");

        resolv-file = lib.mkDefault (lib.optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf");

      };



      configFile = dnsmasqConf;

    };



    networking.nameservers = lib.optional cfg.resolveLocalQueries "127.0.0.1";

nixos/tests/pihole-ftl/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 


{

  basic = runTest ./basic.nix;

  dnsmasq = runTest ./dnsmasq.nix;

}

nixos/tests/pihole-ftl/dnsmasq.nix

0 → 100644
+20 −0
Original line number Diff line number Diff line 
let

  port = "9077";

in

{

  name = "pihole-ftl-dnsmasq";



  nodes.machine = {

    services.pihole-ftl = {

      enable = true;

      useDnsmasqConfig = true;

      settings.webserver.port = port;

    };

  };



  testScript = ''

    start_all()

    machine.wait_for_unit("pihole-ftl.service")

    machine.wait_for_open_port(${port})

  '';

}

pkgs/by-name/dn/dnsmasq/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ stdenv.mkDerivation rec { 
    inherit (nixosTests) dnscrypt-proxy;

    kubernetes-dns-single = nixosTests.kubernetes.dns-single-node;

    kubernetes-dns-multi = nixosTests.kubernetes.dns-multi-node;

    pihole-ftl-dnsmasq = nixosTests.pihole-ftl.dnsmasq;

  };



  meta = with lib; {

pkgs/by-name/pi/pihole-ftl/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -77,8 +77,11 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook postInstall

  '';



  passthru.settingsTemplate = ./pihole.toml;

  passthru.tests = nixosTests.pihole-ftl;

  passthru = {

    settingsTemplate = ./pihole.toml;



    tests = nixosTests.pihole-ftl;

  };



  meta = {

    description = "Pi-hole FTL engine";