wireguard: Use networking.hostName instead of a weird host param
Eelco Dolstra committed
Apr 26, 2019 at 13:11 UTC
3f86923962acc55daa39ebf184aed787b1a8f7e1
3 files changed
+15
-16
bastion/network.nix
+1
-1
@@ -117,7 +117,7 @@ in
117
118
imports =
119
[ ../modules/common.nix
120
- (import ../modules/wireguard.nix "bastion")
120
+ ../modules/wireguard.nix
121
../modules/tarball-mirror.nix
122
../modules/hydra-mirror.nix
123
];
delft/network.nix
+8
-8
@@ -43,7 +43,7 @@ in {
43
extra = {
44
imports = [
45
../macs/nodes/mac1.nix
46
- (import ../modules/wireguard.nix "mac1")
46
+ ../modules/wireguard.nix
47
];
48
};
49
};
@@ -53,7 +53,7 @@ in {
53
extra = {
54
imports = [
55
../macs/nodes/mac2.nix
56
- (import ../modules/wireguard.nix "mac2")
56
+ ../modules/wireguard.nix
57
];
58
};
59
};
@@ -63,7 +63,7 @@ in {
63
extra = {
64
imports = [
65
../macs/nodes/mac3.nix
66
- (import ../modules/wireguard.nix "mac3")
66
+ ../modules/wireguard.nix
67
({ config, lib, ... }: {
68
monitorama.enable = true;
69
monitorama.hosts = let
@@ -86,7 +86,7 @@ in {
86
extra = {
87
imports = [
88
../macs/nodes/mac4.nix
89
- (import ../modules/wireguard.nix "mac4")
89
+ ../modules/wireguard.nix
90
];
91
};
92
};
@@ -96,7 +96,7 @@ in {
96
extra = {
97
imports = [
98
../macs/nodes/mac5.nix
99
- (import ../modules/wireguard.nix "mac5")
99
+ ../modules/wireguard.nix
100
];
101
};
102
};
@@ -106,7 +106,7 @@ in {
106
extra = {
107
imports = [
108
../macs/nodes/mac6.nix
109
- (import ../modules/wireguard.nix "mac6")
109
+ ../modules/wireguard.nix
110
];
111
};
112
};
@@ -116,7 +116,7 @@ in {
116
extra = {
117
imports = [
118
../macs/nodes/mac7.nix
119
- (import ../modules/wireguard.nix "mac7")
119
+ ../modules/wireguard.nix
120
];
121
};
122
};
@@ -126,7 +126,7 @@ in {
126
extra = {
127
imports = [
128
../macs/nodes/mac8.nix
129
- (import ../modules/wireguard.nix "mac8")
129
+ ../modules/wireguard.nix
130
];
131
};
132
};
modules/wireguard.nix
+6
-7
@@ -1,5 +1,4 @@
1
-host:
2
-{ lib, ... }:
1
+{ config, lib, ... }:
2
let
3
network = 16;
4
hosts = {
@@ -49,15 +48,15 @@ let
48
&& (hostcfg ? "publicKey")
49
) hosts;
50
in lib.mkMerge [
52
- (lib.mkIf (hosts."${host}" ? "port") {
53
- networking.firewall.allowedUDPPorts = [ hosts."${host}".port ];
51
+ (lib.mkIf (hosts."${config.networking.hostName}" ? "port") {
52
+ networking.firewall.allowedUDPPorts = [ hosts."${config.networking.hostName}".port ];
53
})
54
{
55
networking.wireguard.interfaces.wg0 = {
57
- ips = [ "${hosts."${host}".ip}/${toString network}" ];
56
+ ips = [ "${hosts."${config.networking.hostName}".ip}/${toString network}" ];
57
privateKeyFile = "/etc/wireguard/private.key";
58
generatePrivateKeyFile = true;
60
- listenPort = hosts."${host}".port or null;
59
+ listenPort = hosts."${config.networking.hostName}".port or null;
60
61
peers = lib.mapAttrsToList (hostname: hostcfg:
62
{
@@ -67,7 +66,7 @@ in lib.mkMerge [
66
endpoint = "${hostcfg.endpoint}:${toString hostcfg.port}";
67
persistentKeepalive = 60;
68
})
70
- ) (peerable host);
69
+ ) (peerable config.networking.hostName);
70
};
71
}
72
]
\ No newline at end of file