Webserver: add to wireguard, eris
Graham Christensen committed
Sep 30, 2019 at 22:43 UTC
8d40cf09443e21078c28012fe17fcc5f52a46e4b
3 files changed
+13
-3
delft/eris.nix
+4
-3
@@ -21,6 +21,8 @@ in {
21
10.254.1.7 lucifer
22
10.254.1.8 wendy
23
24
+ 10.254.3.1 webserver
25
+
26
'' + (toString (flip mapAttrsToList macs (machine: v: ''
27
${v.deployment.targetHost} ${machine}
28
'')));
@@ -66,13 +68,12 @@ in {
68
{
69
targets = [
70
"chef:9100"
69
- "nixos.org:9100"
71
];
72
labels.role = "builder";
73
}
74
{
75
targets = [
75
- "nixos.org:9100"
76
+ "webserver:9100"
77
];
78
labels.role = "webserver";
79
}
@@ -96,7 +97,7 @@ in {
97
}
98
{
99
targets = [
99
- "nixos.org:9300"
100
+ "webserver:9300"
101
];
102
labels.role = "webserver";
103
}
modules/wireguard.nix
+8
@@ -96,6 +96,14 @@ let
96
ip = "10.254.2.9";
97
publicKey = "i3fOonYJsDhhF8YXrWfaLQgb4J3OphOs7DTTCGTDNCQ=";
98
};
99
+
100
+
101
+ webserver = {
102
+ ip = "10.254.3.1";
103
+ publicKey = "/N5//y0elGZdeekUv+IzKZiZ9wcKSOHc2bHmPU8FaCM=";
104
+ enpdoint = "54.217.220.47";
105
+ port = 51820;
106
+ };
107
};
108
109
peerable = selfHost: lib.filterAttrs (hostname: hostcfg:
nixos-org/network.nix
+1
@@ -145,6 +145,7 @@ in
145
[ ./webserver.nix
146
../modules/hydra-mirror-user.nix
147
../modules/prometheus
148
+ ../modules/wireguard.nix
149
];
150
151
users.users.hydra-mirror.openssh.authorizedKeys.keys =