lol

Merge pull request #254181 from StillerHarpo/adguardhome

nixos/adguardhome: Fix openFirewall

authored by

Fabián Heredia Montiel and committed by
GitHub
cc1fdc53 3710b38c

+3 -3
+3 -2
nixos/modules/services/networking/adguardhome.nix
··· 17 17 text = builtins.toJSON cfg.settings; 18 18 checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config"; 19 19 }; 20 + defaultBindPort = 3000; 20 21 21 22 in 22 23 { ··· 86 87 ''; 87 88 }; 88 89 bind_port = mkOption { 89 - default = 3000; 90 + default = defaultBindPort; 90 91 type = port; 91 92 description = lib.mdDoc '' 92 93 Port to serve HTTP pages on. ··· 169 170 }; 170 171 }; 171 172 172 - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port ]; 173 + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port or defaultBindPort ]; 173 174 }; 174 175 }
-1
nixos/tests/adguardhome.nix
··· 7 7 emptyConf = { lib, ... }: { 8 8 services.adguardhome = { 9 9 enable = true; 10 - settings = {}; 11 10 }; 12 11 }; 13 12