Skip to content

[20.03] nixos/i2pd: address #63103 #88884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rnhmjoj merged 1 commit into from
May 26, 2020
Merged

[20.03] nixos/i2pd: address #63103 #88884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions nixos/modules/services/networking/i2pd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ let
(sec "addressbook")
(strOpt "defaulturl" cfg.addressbook.defaulturl)
] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
++ (flip mapAttrs
(collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto)
++ (flip map
(collect (proto: proto ? port && proto ? address) cfg.proto)
(proto: let protoOpts = [
(sec name)
(sec proto.name)
(boolOpt "enabled" proto.enable)
(strOpt "address" proto.address)
(intOpt "port" proto.port)
Expand All @@ -181,10 +181,10 @@ let

tunnelConf = let opts = [
notice
(flip mapAttrs
(collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels)
(flip map
(collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
(tun: let outTunOpts = [
(sec name)
(sec tun.name)
"type = client"
(intOpt "port" tun.port)
(strOpt "destination" tun.destination)
Expand All @@ -204,10 +204,10 @@ let
++ (if tun ? crypto.tagsToSend then
optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []);
in concatStringsSep "\n" outTunOpts))
(flip mapAttrs
(collect (name: tun: tun ? port && tun ? address) cfg.inTunnels)
(flip map
(collect (tun: tun ? port && tun ? address) cfg.inTunnels)
(tun: let inTunOpts = [
(sec name)
(sec tun.name)
"type = server"
(intOpt "port" tun.port)
(strOpt "host" tun.address)
Expand Down Expand Up @@ -606,7 +606,7 @@ in

outTunnels = mkOption {
default = {};
type = with types; loaOf (submodule (
type = with types; attrsOf (submodule (
{ name, ... }: {
options = {
destinationPort = mkOption {
Expand All @@ -627,7 +627,7 @@ in

inTunnels = mkOption {
default = {};
type = with types; loaOf (submodule (
type = with types; attrsOf (submodule (
{ name, ... }: {
options = {
inPort = mkOption {
Expand Down