cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/network-interfaces: fix examples types

Browse source 
make literalExample receive string arguments.
Fix nixos/nixos-homepage#255
This commit is contained in:
David Costa 2020-03-29 00:50:26 +01:00
parent f8ccef5edb
commit 2e4a45c921
1 changed files with 69 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
nixos/modules/tasks/network-interfaces.nix
View file

@ -634,19 +634,23 @@ in
networking.bonds =
let
driverOptionsExample = {
miimon = "100";
mode = "active-backup";
};
driverOptionsExample = ''
{
miimon = "100";
mode = "active-backup";
}
'';
in mkOption {
default = { };
example = literalExample {
bond0 = {
interfaces = [ "eth0" "wlan0" ];
driverOptions = driverOptionsExample;
};
anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
};
example = literalExample ''
{
bond0 = {
interfaces = [ "eth0" "wlan0" ];
driverOptions = ${driverOptionsExample};
};
anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
}
'';
description = ''
This option allows you to define bond devices that aggregate multiple,
underlying networking interfaces together. The value of this option is
@ -731,12 +735,14 @@ in
networking.macvlans = mkOption {
default = { };
example = literalExample {
wan = {
interface = "enp2s0";
mode = "vepa";
};
};
example = literalExample ''
{
wan = {
interface = "enp2s0";
mode = "vepa";
};
}
'';
description = ''
This option allows you to define macvlan interfaces which should
be automatically created.
@ -764,18 +770,20 @@ in
networking.sits = mkOption {
default = { };
example = literalExample {
hurricane = {
remote = "10.0.0.1";
local = "10.0.0.22";
ttl = 255;
};
msipv6 = {
remote = "192.168.0.1";
dev = "enp3s0";
ttl = 127;
};
};
example = literalExample ''
{
hurricane = {
remote = "10.0.0.1";
local = "10.0.0.22";
ttl = 255;
};
msipv6 = {
remote = "192.168.0.1";
dev = "enp3s0";
ttl = 127;
};
}
'';
description = ''
This option allows you to define 6-to-4 interfaces which should be automatically created.
'';
@ -826,16 +834,18 @@ in
networking.vlans = mkOption {
default = { };
example = literalExample {
vlan0 = {
id = 3;
interface = "enp3s0";
};
vlan1 = {
id = 1;
interface = "wlan0";
};
};
example = literalExample ''
{
vlan0 = {
id = 3;
interface = "enp3s0";
};
vlan1 = {
id = 1;
interface = "wlan0";
};
}
'';
description =
''
This option allows you to define vlan devices that tag packets
@ -868,24 +878,26 @@ in
networking.wlanInterfaces = mkOption {
default = { };
example = literalExample {
wlan-station0 = {
device = "wlp6s0";
};
wlan-adhoc0 = {
type = "ibss";
device = "wlp6s0";
mac = "02:00:00:00:00:01";
};
wlan-p2p0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:02";
};
wlan-ap0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:03";
};
};
example = literalExample ''
{
wlan-station0 = {
device = "wlp6s0";
};
wlan-adhoc0 = {
type = "ibss";
device = "wlp6s0";
mac = "02:00:00:00:00:01";
};
wlan-p2p0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:02";
};
wlan-ap0 = {
device = "wlp6s0";
mac = "02:00:00:00:00:03";
};
}
'';
description =
''
Creating multiple WLAN interfaces on top of one physical WLAN device (NIC).