diff options
| author | Fabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com> | 2023-09-12 16:23:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 16:23:16 -0500 |
| commit | cc1fdc5376e56462f0618df7b8481d188b301798 (patch) | |
| tree | 200dd41f8743fffa0c5516a1e58a0cf2e9b8434b /nixos | |
| parent | 3710b38ccbef38e8c28b9584ea271f42524b29d6 (diff) | |
| parent | 20acd199f4202da863f290b50345d30c85db913c (diff) | |
Merge pull request #254181 from StillerHarpo/adguardhome
nixos/adguardhome: Fix openFirewall
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/adguardhome.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/adguardhome.nix | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 1701e5b439c18..399d838ccc699 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -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 ]; }; } diff --git a/nixos/tests/adguardhome.nix b/nixos/tests/adguardhome.nix index 9f8ddc33f57e9..a6f790b83f5fc 100644 --- a/nixos/tests/adguardhome.nix +++ b/nixos/tests/adguardhome.nix @@ -7,7 +7,6 @@ emptyConf = { lib, ... }: { services.adguardhome = { enable = true; - settings = {}; }; }; |