Unverified Commit 20acd199 authored by Florian Engel's avatar Florian Engel
Browse files

nixos/adguardhome: Fix openFirewall 

When not setting `settings` and setting `openFirewall = true`
evaluation would fail because it tries to access `settings.bind_port`
while `settings == null`
parent 364ab129

nixos/modules/services/networking/adguardhome.nix

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ let 
    text = builtins.toJSON cfg.settings;

    checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config";

  };

  defaultBindPort = 3000;



in

{
@@ -86,7 +87,7 @@ in 
            '';

          };

          bind_port = mkOption {

            default = 3000;

            default = defaultBindPort;

            type = port;

            description = lib.mdDoc ''

              Port to serve HTTP pages on.
@@ -169,6 +170,6 @@ in 
      };

    };



    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port ];

    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port or defaultBindPort ];

  };

}

nixos/tests/adguardhome.nix

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
    emptyConf = { lib, ... }: {

      services.adguardhome = {

        enable = true;

        settings = {};

      };

    };