diff options
author | Marius Bergmann <marius@yeai.de> | 2017-09-27 21:16:22 +0200 |
---|---|---|
committer | Marius Bergmann <marius@yeai.de> | 2017-09-27 22:18:03 +0200 |
commit | dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a (patch) | |
tree | a91584b0ec4b9678cd2acaf2c1173c38dd531cac /nixos | |
parent | 34750bb51cd337a96ca8ff82356ef100cd732c94 (diff) | |
download | nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar.gz nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar.bz2 nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar.lz nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar.xz nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.tar.zst nixpkgs-dd50575d5a92eaf6cd9568ee53a86add0fe3aa7a.zip |
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).
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/znc.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 763843fdec0..3d9cec46a58 100644 --- 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 = { |