commit 82a3e70b2db564a0df05e60cf3ec64370d84b566 · pyrox.dev/nixpkgs

+16 -9

nixos/modules/services/networking/pihole-ftl.nix

···

       198
       198
        
               '';

     

       199
       199
        
             };

     

       200
       200
        
           };

     

       201
       201
       +
       

     

       202
       202
       +
           webserverEnabled = mkOption {

     

       203
       203
       +
             type = types.bool;

     

       204
       204
       +
             default = (

     

       205
       205
       +
               (hasAttrByPath [ "webserver" "port" ] cfg.settings)

     

       206
       206
       +
               && !builtins.elem cfg.settings.webserver.port [

     

       207
       207
       +
                 ""

     

       208
       208
       +
                 null

     

       209
       209
       +
               ]

     

       210
       210
       +
             );

     

       211
       211
       +
             internal = true;

     

       212
       212
       +
             description = "Whether the webserver is enabled.";

     

       213
       213
       +
           };

     

       201
       214
        
         };

     

       202
       215
        
       

     

       203
       216
        
         config = mkIf cfg.enable {

     
···

       208
       221
        
             }

     

       209
       222
        
       

     

       210
       223
        
             {

     

       211
       211
       -
               assertion =

     

       212
       212
       -
                 builtins.length cfg.lists == 0

     

       213
       213
       -
                 || (

     

       214
       214
       -
                   (hasAttrByPath [ "webserver" "port" ] cfg.settings)

     

       215
       215
       -
                   && !builtins.elem cfg.settings.webserver.port [

     

       216
       216
       -
                     ""

     

       217
       217
       -
                     null

     

       218
       218
       -
                   ]

     

       219
       219
       -
                 );

     

       224
       224
       +
               assertion = builtins.length cfg.lists == 0 || cfg.webserverEnabled;

     

       220
       225
        
               message = ''

     

       221
       226
        
                 The Pi-hole webserver must be enabled for lists set in services.pihole-ftl.lists to be automatically loaded on startup via the web API.

     

       222
       227
        
                 services.pihole-ftl.settings.port must be defined, e.g. by enabling services.pihole-web.enable and defining services.pihole-web.port.

     
···

       348
       353
        
       

     

       349
       354
        
             pihole-ftl-setup = {

     

       350
       355
        
               description = "Pi-hole FTL setup";

     

       356
       356
       +
               enable = builtins.length cfg.lists > 0;

     

       357
       357
       +
       

     

       351
       358
        
               # Wait for network so lists can be downloaded

     

       352
       359
        
               after = [ "network-online.target" ];

     

       353
       360
        
               requires = [ "network-online.target" ];

nixos/tests/all-tests.nix

···

       1194
       1194
        
         pict-rs = runTest ./pict-rs.nix;

     

       1195
       1195
        
         pingvin-share = runTest ./pingvin-share.nix;

     

       1196
       1196
        
         pinnwand = runTest ./pinnwand.nix;

     

       1197
       1197
       +
         pihole-ftl = import ./pihole-ftl { inherit runTest; };

     

       1197
       1198
        
         plantuml-server = runTest ./plantuml-server.nix;

     

       1198
       1199
        
         plasma6 = runTest ./plasma6.nix;

     

       1199
       1200
        
         plausible = runTest ./plausible.nix;

+47

nixos/tests/pihole-ftl/basic.nix

···

       1
       1
       +
       # A basic test with no webserver, no API, just checking DNS functionality

     

       2
       2
       +
       {

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       rec {

     

       9
       9
       +
         name = "pihole-ftl-basic";

     

       10
       10
       +
         meta.maintainers = with lib.maintainers; [ averyvigolo ];

     

       11
       11
       +
       

     

       12
       12
       +
         nodes.machine =

     

       13
       13
       +
           { pkgs, lib, ... }:

     

       14
       14
       +
           {

     

       15
       15
       +
             services.pihole-ftl = {

     

       16
       16
       +
               enable = true;

     

       17
       17
       +
               openFirewallDNS = true;

     

       18
       18
       +
             };

     

       19
       19
       +
             environment.systemPackages = with pkgs; [ dig ];

     

       20
       20
       +
           };

     

       21
       21
       +
       

     

       22
       22
       +
         nodes.client =

     

       23
       23
       +
           { pkgs, lib, ... }:

     

       24
       24
       +
           {

     

       25
       25
       +
             environment.systemPackages = with pkgs; [ dig ];

     

       26
       26
       +
           };

     

       27
       27
       +
       

     

       28
       28
       +
         testScript =

     

       29
       29
       +
           { nodes, ... }:

     

       30
       30
       +
           ''

     

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

     

       32
       32
       +
             machine.wait_for_open_port(53)

     

       33
       33
       +
             client.wait_for_unit("network.target")

     

       34
       34
       +
       

     

       35
       35
       +
             with subtest("the pi-hole machine resolves properly"):

     

       36
       36
       +
               ret, out = machine.execute("dig @localhost +short pi.hole")

     

       37
       37
       +
               assert ret == 0, "pi.hole should resolve on the local machine"

     

       38
       38
       +
               assert out.rstrip() == "127.0.0.1", "pi.hole should resolve to localhost on the local machine"

     

       39
       39
       +
       

     

       40
       40
       +
             machine_address = "${(builtins.head nodes.machine.networking.interfaces.eth1.ipv4.addresses).address}"

     

       41
       41
       +
       

     

       42
       42
       +
             with subtest("a client machine resolves properly"):

     

       43
       43
       +
               ret, out = client.execute(f"dig @{machine_address} +short pi.hole")

     

       44
       44
       +
               assert ret == 0, "pi.hole should resolve on a client machine"

     

       45
       45
       +
               assert out.rstrip() == machine_address, "pi.hole should resolve to the machine's address"

     

       46
       46
       +
           '';

     

       47
       47
       +
       }

nixos/tests/pihole-ftl/default.nix

···

       1
       1
       +
       { runTest }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         basic = runTest ./basic.nix;

     

       5
       5
       +
       }