Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

types: use cidr only in tinc.subnets

Browse Source
This commit is contained in:
lassulus 2017-11-28 19:40:03 +01:00
parent d7b599e301
commit 5014ba291d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
krebs/3modules/lass/default.nix
View File

@ -449,8 +449,6 @@ with import <stockholm/lib>;
retiolum = rec { retiolum = rec {
via = internet; via = internet;
addrs = [ addrs = [
# edinburgh university
"129.215.0.0/16"
ip4.addr ip4.addr
ip6.addr ip6.addr
]; ];
@ -472,6 +470,10 @@ with import <stockholm/lib>;
lyK301Jb42wGEsVWxu3Eo/PLtp8OdD+Wdh6o/ELcc0k/YCUGFMujUM8CAwEAAQ== lyK301Jb42wGEsVWxu3Eo/PLtp8OdD+Wdh6o/ELcc0k/YCUGFMujUM8CAwEAAQ==
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
''; '';
tinc.subnets = [
# edinburgh university
"129.215.0.0/16"
];
}; };
}; };
}; };

9
lib/types.nix
View File

@ -92,7 +92,7 @@ rec {
default = null; default = null;
}; };
addrs = mkOption { addrs = mkOption {
type = listOf cidr; type = listOf addr;
default = default =
optional (config.ip4 != null) config.ip4.addr ++ optional (config.ip4 != null) config.ip4.addr ++
optional (config.ip6 != null) config.ip6.addr; optional (config.ip6 != null) config.ip6.addr;
@ -155,6 +155,8 @@ rec {
++ ++
(map (a: "Subnet = ${a}") net.addrs) (map (a: "Subnet = ${a}") net.addrs)
++ ++
(map (a: "Subnet = ${a}") config.subnets)
++
[config.extraConfig] [config.extraConfig]
++ ++
[config.pubkey] [config.pubkey]
@ -173,6 +175,11 @@ rec {
description = "tinc port to use to connect to host"; description = "tinc port to use to connect to host";
default = 655; default = 655;
}; };
subnets = mkOption {
type = listOf cidr;
description = "tinc subnets";
default = [];
};
}; };
})); }));
default = null; default = null;