forked from zentralwerk/network
s/forwardedPorts/forwardPorts/
This commit is contained in:
parent
d820cdffd3
commit
ec6d26ab08
|
@ -129,7 +129,7 @@ in
|
||||||
stubNets6 = ospfConf.stubnets-inet6;
|
stubNets6 = ospfConf.stubnets-inet6;
|
||||||
};
|
};
|
||||||
|
|
||||||
forwardedPorts =
|
forwardPorts =
|
||||||
if ctPillar ? port-forwarding
|
if ctPillar ? port-forwarding
|
||||||
then map ({ proto, port, to }: {
|
then map ({ proto, port, to }: {
|
||||||
proto = proto;
|
proto = proto;
|
||||||
|
|
|
@ -157,7 +157,7 @@ let
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = config.site.hosts.${name}.interfaces ? core;
|
default = config.site.hosts.${name}.interfaces ? core;
|
||||||
};
|
};
|
||||||
forwardedPorts = mkOption {
|
forwardPorts = mkOption {
|
||||||
type = with types; listOf (submodule { options = {
|
type = with types; listOf (submodule { options = {
|
||||||
proto = mkOption {
|
proto = mkOption {
|
||||||
type = types.enum [ "tcp" "udp" ];
|
type = types.enum [ "tcp" "udp" ];
|
||||||
|
|
|
@ -94,6 +94,6 @@ in
|
||||||
enableIPv6 = true;
|
enableIPv6 = true;
|
||||||
internalInterfaces = [ "core" ];
|
internalInterfaces = [ "core" ];
|
||||||
externalInterface = firstTunnel;
|
externalInterface = firstTunnel;
|
||||||
forwardPorts = config.site.hosts.${hostName}.forwardedPorts;
|
inherit (config.site.hosts.${hostName}) forwardPorts;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
internalInterfaces = [ "core" ];
|
internalInterfaces = [ "core" ];
|
||||||
externalInterface = firstUpstreamInterface;
|
externalInterface = firstUpstreamInterface;
|
||||||
forwardPorts = config.site.hosts.${hostName}.forwardedPorts;
|
inherit (config.site.hosts.${hostName}) forwardPorts;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user