public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network-interfaces service: add defaultGateway{,6}.interface

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-01-14 04:14:16 +03:00
parent fcb20b9fee
commit 0cb487ee04
3 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -102,17 +102,21 @@ in
EOF EOF
# Set the default gateway. # Set the default gateway.
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") '' ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
# FIXME: get rid of "|| true" (necessary to make it idempotent). # FIXME: get rid of "|| true" (necessary to make it idempotent).
ip route add default via "${cfg.defaultGateway}" ${ ip route add default via "${cfg.defaultGateway.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null) optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} || true "window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway.interface != null)
"dev ${cfg.defaultGateway.interface}"}|| true
''} ''}
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") '' ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
# FIXME: get rid of "|| true" (necessary to make it idempotent). # FIXME: get rid of "|| true" (necessary to make it idempotent).
ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${ ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null) optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} || true "window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway6.interface != null)
"dev ${cfg.defaultGateway6.interface}"} || true
''} ''}
''; '';
}; };

6
nixos/modules/tasks/network-interfaces-systemd.nix
View File

@ -38,6 +38,12 @@ in
} { } {
assertion = cfg.vswitches == {}; assertion = cfg.vswitches == {};
message = "networking.vswichtes are not supported by networkd."; message = "networking.vswichtes are not supported by networkd.";
} {
assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null;
message = "networking.defaultGateway.interface is not supported by networkd.";
} {
assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;
message = "networking.defaultGateway6.interface is not supported by networkd.";
} ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
assertion = !rstp; assertion = !rstp;
message = "networking.bridges.${n}.rstp is not supported by networkd."; message = "networking.bridges.${n}.rstp is not supported by networkd.";

42
nixos/modules/tasks/network-interfaces.nix
View File

@ -116,6 +116,28 @@ let
}; };
}; };
gatewayCoerce = address: { inherit address; };
gatewayOpts = { ... }: {
options = {
address = mkOption {
type = types.str;
description = "The default gateway address.";
};
interface = mkOption {
type = types.nullOr types.str;
default = null;
example = "enp0s3";
description = "The default gateway interface.";
};
};
};
interfaceOpts = { name, ... }: { interfaceOpts = { name, ... }: {
options = { options = {
@ -327,19 +349,27 @@ in
networking.defaultGateway = mkOption { networking.defaultGateway = mkOption {
default = null; default = null;
example = "131.211.84.1"; example = {
type = types.nullOr types.str; address = "131.211.84.1";
device = "enp3s0";
};
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
description = '' description = ''
The default gateway. It can be left empty if it is auto-detected through DHCP. The default gateway. It can be left empty if it is auto-detected through DHCP.
It can be specified as a string or an option set along with a network interface.
''; '';
}; };
networking.defaultGateway6 = mkOption { networking.defaultGateway6 = mkOption {
default = null; default = null;
example = "2001:4d0:1e04:895::1"; example = {
type = types.nullOr types.str; address = "2001:4d0:1e04:895::1";
device = "enp3s0";
};
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
description = '' description = ''
The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP.
It can be specified as a string or an option set along with a network interface.
''; '';
}; };