znc: fix openFirewall option

The current version is broken: - there's no `openFirewall` attribute directly in the `cfg` set - the `port` option is an attribute of the `confOptions` set I used the proper attribute for the firewall port and moved the `openFirewall` option directly up to the `services.znc` set, as it's rather a general option for the whole service than a znc-specific option (which are located inside the `confOptions` set).
NixOS · Sep 27, 2017 · b9935c7 · b9935c7
1 parent 24f0aec
commit b9935c7
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
@@ -212,6 +212,14 @@ in
         '';
       };
 
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to open ports in the firewall for ZNC.
+        '';
+      };
+
       zncConf = mkOption {
         default = "";
         example = "See: http://wiki.znc.in/Configuration";
@@ -276,14 +284,6 @@ in
           '';
         };
 
-        openFirewall = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Whether to open ports in the firewall for ZNC.
-          '';
-        };
-
         passBlock = mkOption {
           example = defaultPassBlock;
           type = types.string;
@@ -359,7 +359,7 @@ in
   config = mkIf cfg.enable {
 
     networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.port ];
+      allowedTCPPorts = [ cfg.confOptions.port ];
     };
 
     systemd.services.znc = {