summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/lass/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-12-19 14:10:21 +0100
committermakefu <github@syntax-fehler.de>2018-12-19 14:10:21 +0100
commitb7529f97e118f1b4da91acae2c21a06eae6e5638 (patch)
treeb368295e641d65b7303cb987be85f80c3c62cd9b /krebs/3modules/lass/default.nix
parent5299bd93a0240580bc1aec377436c44273f144e5 (diff)
parentdc79107558105a3b6afb558f194965fcb3867542 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/lass/default.nix')
-rw-r--r--krebs/3modules/lass/default.nix24
1 files changed, 14 insertions, 10 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 1eac198fa..9d1d56ad3 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -8,7 +8,7 @@ with import <stockholm/lib>;
};
r6 = ip: (krebs.genipv6 "retiolum" "lass" ip).address;
- w6 = ip: (krebs.genipv6 "wirelum" "lass" ip).address;
+ w6 = ip: (krebs.genipv6 "wiregrill" "lass" ip).address;
in {
dns.providers = {
@@ -89,7 +89,7 @@ in {
-----END RSA PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
via = internet;
ip4.addr = "10.244.1.1";
ip6.addr = w6 "1";
@@ -98,7 +98,11 @@ in {
];
wireguard = {
pubkey = "oKJotppdEJqQBjrqrommEUPw+VFryvEvNJr/WikXohk=";
- subnets = [ "10.244.1.0/24" "42:1::/32" ];
+ subnets = [
+ "10.244.1.0/24"
+ (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
+ (krebs.genipv6 "wiregrill" "lass" 0).subnetCIDR
+ ];
};
};
};
@@ -191,7 +195,7 @@ in {
-----END RSA PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "dea7";
aliases = [
"mors.w"
@@ -224,7 +228,7 @@ in {
-----END RSA PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "50da";
aliases = [
"shodan.w"
@@ -257,7 +261,7 @@ in {
-----END RSA PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "1205";
aliases = [
"icarus.w"
@@ -419,7 +423,7 @@ in {
-----END PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "3110";
aliases = [
"yellow.w"
@@ -456,7 +460,7 @@ in {
-----END PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "b1ce";
aliases = [
"blue.w"
@@ -469,7 +473,7 @@ in {
};
phone = {
nets = {
- wirelum = {
+ wiregrill = {
ip4.addr = "10.244.1.2";
ip6.addr = w6 "a";
aliases = [
@@ -506,7 +510,7 @@ in {
-----END RSA PUBLIC KEY-----
'';
};
- wirelum = {
+ wiregrill = {
ip6.addr = w6 "012f";
aliases = [
"morpheus.w"