delft network: include wireguard by default
Graham Christensen committed
Sep 26, 2019 at 19:04 UTC
cd597824e3941f13512ea64f69d1d4b1dcb72e7f
4 files changed
+3
-15
delft/ceres.nix
-1
@@ -6,7 +6,6 @@
6
./hydra.nix
7
./hydra-proxy.nix
8
./fstrim.nix
9
- ../modules/wireguard.nix
9
./packet-importer.nix
10
];
11
delft/chef.nix
-1
@@ -5,7 +5,6 @@
5
[ ./common.nix
6
./datadog.nix
7
./fstrim.nix
8
- ../modules/wireguard.nix
8
];
9
10
deployment.targetEnv = "hetzner";
delft/eris.nix
-5
@@ -4,11 +4,6 @@ let
4
5
macs = filterAttrs (_: v: (v.macosGuest or {}).enable or false) resources.machines;
6
in {
7
- imports =
8
- [
9
- ../modules/wireguard.nix
10
- ];
11
-
7
deployment.targetEnv = "hetzner";
8
deployment.hetzner.mainIPv4 = "138.201.32.77";
9
delft/network.nix
+3
-8
@@ -29,6 +29,9 @@ let
29
};
30
31
in {
32
+ defaults = {
33
+ imports = [ ../modules/wireguard.nix ];
34
+ };
35
hydra = { deployment.targetHost = "hydra.ewi.tudelft.nl"; imports = [ ./build-machines-dell-1950.nix ]; };
36
lucifer = { deployment.targetHost = "lucifer.ewi.tudelft.nl"; imports = [ ./lucifer.nix ]; };
37
wendy = { deployment.targetHost = "wendy.ewi.tudelft.nl"; imports = [ ./wendy.nix ]; };
@@ -44,7 +47,6 @@ in {
47
extra = {
48
imports = [
49
../macs/nodes/mac1.nix
47
- ../modules/wireguard.nix
50
];
51
};
52
};
@@ -54,7 +56,6 @@ in {
56
extra = {
57
imports = [
58
../macs/nodes/mac2.nix
57
- ../modules/wireguard.nix
59
];
60
};
61
};
@@ -64,7 +65,6 @@ in {
65
extra = {
66
imports = [
67
../macs/nodes/mac3.nix
67
- ../modules/wireguard.nix
68
({ config, lib, ... }: {
69
monitorama.enable = true;
70
monitorama.hosts = let
@@ -87,7 +87,6 @@ in {
87
extra = {
88
imports = [
89
../macs/nodes/mac4.nix
90
- ../modules/wireguard.nix
90
];
91
};
92
};
@@ -97,7 +96,6 @@ in {
96
extra = {
97
imports = [
98
../macs/nodes/mac5.nix
100
- ../modules/wireguard.nix
99
];
100
};
101
};
@@ -107,7 +105,6 @@ in {
105
extra = {
106
imports = [
107
../macs/nodes/mac6.nix
110
- ../modules/wireguard.nix
108
];
109
};
110
};
@@ -117,7 +114,6 @@ in {
114
extra = {
115
imports = [
116
../macs/nodes/mac7.nix
120
- ../modules/wireguard.nix
117
];
118
};
119
};
@@ -127,7 +123,6 @@ in {
123
extra = {
124
imports = [
125
../macs/nodes/mac8.nix
130
- ../modules/wireguard.nix
126
];
127
};
128
};