Fixup indentation problems in network.nix
zimbatm committed
Apr 26, 2019 at 08:25 UTC
adf4292098dc6ee83616e7bf0af558dd1b1f5fa9
2 files changed
+14
-13
bastion/network.nix
+1
-1
@@ -117,7 +117,7 @@ in
117
118
imports =
119
[ ../modules/common.nix
120
- ../modules/wireguard.nix
120
+ ../modules/wireguard.nix
121
../modules/tarball-mirror.nix
122
../modules/hydra-mirror.nix
123
];
delft/network.nix
+13
-12
@@ -43,7 +43,7 @@ in {
43
extra = {
44
imports = [
45
../macs/nodes/mac1.nix
46
- ../modules/wireguard.nix
46
+ ../modules/wireguard.nix
47
];
48
};
49
};
@@ -53,7 +53,7 @@ in {
53
extra = {
54
imports = [
55
../macs/nodes/mac2.nix
56
- ../modules/wireguard.nix
56
+ ../modules/wireguard.nix
57
];
58
};
59
};
@@ -63,9 +63,9 @@ in {
63
extra = {
64
imports = [
65
../macs/nodes/mac3.nix
66
- ../modules/wireguard.nix
67
- ({ config, lib, ... }: {
68
- monitorama.enable = true;
66
+ ../modules/wireguard.nix
67
+ ({ config, lib, ... }: {
68
+ monitorama.enable = true;
69
monitorama.hosts = let
70
nums = lib.lists.range 1 9;
71
paths = num: {
@@ -76,7 +76,7 @@ in {
76
"mac3-guest" = "http://${config.macosGuest.network.interiorNetworkPrefix}.2:9100/metrics";
77
};
78
in (builtins.foldl' (a: b: a // b) {} (builtins.map paths nums)) // overrides;
79
- })
79
+ })
80
];
81
};
82
};
@@ -86,7 +86,7 @@ in {
86
extra = {
87
imports = [
88
../macs/nodes/mac4.nix
89
- ../modules/wireguard.nix
89
+ ../modules/wireguard.nix
90
];
91
};
92
};
@@ -96,7 +96,7 @@ in {
96
extra = {
97
imports = [
98
../macs/nodes/mac5.nix
99
- ../modules/wireguard.nix
99
+ ../modules/wireguard.nix
100
];
101
};
102
};
@@ -106,7 +106,7 @@ in {
106
extra = {
107
imports = [
108
../macs/nodes/mac6.nix
109
- ../modules/wireguard.nix
109
+ ../modules/wireguard.nix
110
];
111
};
112
};
@@ -116,7 +116,7 @@ in {
116
extra = {
117
imports = [
118
../macs/nodes/mac7.nix
119
- ../modules/wireguard.nix
119
+ ../modules/wireguard.nix
120
];
121
};
122
};
@@ -126,9 +126,10 @@ in {
126
extra = {
127
imports = [
128
../macs/nodes/mac8.nix
129
- ../modules/wireguard.nix
129
+ ../modules/wireguard.nix
130
];
131
};
132
};
133
- # mac9
133
+
134
+ # mac9 never booted
135
}