From 7e27762b60cebe86be1135680f2b5f3e193c398c Mon Sep 17 00:00:00 2001 From: Max Audron Date: Fri, 29 Sep 2023 09:56:22 +0200 Subject: merge diverged changes --- machines/test/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'machines/test/default.nix') diff --git a/machines/test/default.nix b/machines/test/default.nix index 30ccc3f..d730e3c 100644 --- a/machines/test/default.nix +++ b/machines/test/default.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -{ +let endpoint = "80.240.27.237"; +in { networking = { domain = "vapor.systems"; hostName = "test1"; @@ -10,20 +11,20 @@ wireguard = { enable = true; + inherit endpoint; v4 = { address = "10.10.0.1"; }; v6 = { address = "1"; }; publicKey = "kgb+qZvIHkMx0Rn1E9+zvKK8Qw5vBOkQ5wtO0O1Um1o="; allowedIPs = [ "10.102.5.0/24" "fd15:3d8c:d429:102:500::/72" ]; - endpoint = "80.240.27.237"; }; kubernetes = { role = "server"; - advertiseAddress = "80.240.27.237"; + advertiseAddress = endpoint; }; _module.args.nixinate = { - host = "80.240.27.237"; + host = endpoint; sshUser = "audron"; buildOn = "remote"; substituteOnTarget = true; -- cgit v1.2.3