BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #48756 from Infinisil/fix/znc-extraZncConf

Browse source 
nixos/znc: Fix regressions introduced in #45470
This commit is contained in:
Silvan Mosberger 2018-10-20 21:17:02 +02:00 committed by GitHub
commit 2146c6d8db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/znc/options.nix
View file

@ -239,6 +239,7 @@ in
IPv4 = mkDefault true; IPv4 = mkDefault true;
IPv6 = mkDefault true; IPv6 = mkDefault true;
SSL = mkDefault c.useSSL; SSL = mkDefault c.useSSL;
URIPrefix = c.uriPrefix;
}; };
User.${c.userName} = { User.${c.userName} = {
Admin = mkDefault true; Admin = mkDefault true;
@ -254,8 +255,9 @@ in
listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels); listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels);
extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf; extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf;
}) c.networks; }) c.networks;
extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf; extraConfig = [ c.passBlock ];
}; };
extraConfig = optional (c.extraZncConf != "") c.extraZncConf;
}; };
}; };