diff options
Diffstat (limited to 'cluster')
| -rw-r--r-- | cluster/prod/cluster.nix | 10 | ||||
| -rw-r--r-- | cluster/staging/cluster.nix | 8 | ||||
| -rw-r--r-- | cluster/staging/known_hosts | 1 | ||||
| -rw-r--r-- | cluster/staging/ssh_config | 4 |
4 files changed, 6 insertions, 17 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix index 802d084..44c376e 100644 --- a/cluster/prod/cluster.nix +++ b/cluster/prod/cluster.nix @@ -13,7 +13,6 @@ site_name = "neptune"; publicKey = "VvXT0fPDfWsHxumZqVShpS33dJQAdpJ1E79ZbCBJP34="; IP = "10.83.1.1"; - lan_endpoint = "192.168.1.31:33799"; endpoint = "77.207.15.215:33731"; } { @@ -21,7 +20,6 @@ site_name = "neptune"; publicKey = "goTkBJGmzrGDOAjUcdH9G0JekipqSMoaYQdB6IHnzi0="; IP = "10.83.1.2"; - lan_endpoint = "192.168.1.32:33799"; endpoint = "77.207.15.215:33732"; } { @@ -29,7 +27,6 @@ site_name = "neptune"; publicKey = "oZDAb8LoLW87ktUHyFFec0VaIar97bqq47mGbdVqJ0U="; IP = "10.83.1.3"; - lan_endpoint = "192.168.1.33:33799"; endpoint = "77.207.15.215:33733"; } { @@ -37,7 +34,6 @@ site_name = "orion"; publicKey = "EtRoWBYCdjqgXX0L+uWLg8KxNfIK8k9OTh30tL19bXU="; IP = "10.83.2.1"; - lan_endpoint = "192.168.1.11:33799"; endpoint = "82.66.80.201:33731"; } { @@ -45,7 +41,6 @@ site_name = "orion"; publicKey = "HbLC938mysadMSOxWgq8+qrv+dBKzPP/43OMJp/3phA="; IP = "10.83.2.2"; - lan_endpoint = "192.168.1.12:33799"; endpoint = "82.66.80.201:33732"; } { @@ -53,7 +48,6 @@ site_name = "orion"; publicKey = "e1C8jgTj9eD20ywG08G1FQZ+Js3wMK/msDUE1wO3l1Y="; IP = "10.83.2.3"; - lan_endpoint = "192.168.1.13:33799"; endpoint = "82.66.80.201:33733"; } { @@ -61,7 +55,6 @@ site_name = "bespin"; publicKey = "bIjxey/VhBgVrLa0FxN/KISOt2XFmQeSh1MPivUq9gg="; IP = "10.83.3.1"; - lan_endpoint = "192.168.5.117:33799"; endpoint = "109.136.55.235:33731"; } { @@ -69,7 +62,6 @@ site_name = "bespin"; publicKey = "pUIKv8UBl586O7DBrHBsb9BgNU7WlYQ2r2RSNkD+JAQ="; IP = "10.83.3.2"; - lan_endpoint = "192.168.5.134:33799"; endpoint = "109.136.55.235:33732"; } { @@ -77,7 +69,6 @@ site_name = "bespin"; publicKey = "VBmpo15iIJP7250NAsF+ryhZc3j+8TZFnE1Djvn5TXI="; IP = "10.83.3.3"; - lan_endpoint = "192.168.5.116:33799"; endpoint = "109.136.55.235:33733"; } { @@ -85,7 +76,6 @@ site_name = "scorpio"; publicKey = "Sm9cmNZ/BfWVPFflMO+fuyiera4r203b/dKhHTQmBFg="; IP = "10.83.4.1"; - lan_endpoint = "192.168.1.41:33799"; endpoint = "82.65.41.110:33741"; } ]; diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix index 94ea43b..cf30d6e 100644 --- a/cluster/staging/cluster.nix +++ b/cluster/staging/cluster.nix @@ -13,7 +13,6 @@ site_name = "neptune"; publicKey = "7Nm7pMmyS7Nts1MB+loyD8u84ODxHPTkDu+uqQR6yDk="; IP = "10.14.1.2"; - lan_endpoint = "192.168.1.22:33799"; endpoint = "77.207.15.215:33722"; } { @@ -21,7 +20,6 @@ site_name = "neptune"; publicKey = "lABn/axzD1jkFulX8c+K3B3CbKXORlIMDDoe8sQVxhs="; IP = "10.14.1.3"; - lan_endpoint = "192.168.1.23:33799"; endpoint = "77.207.15.215:33723"; } { @@ -29,7 +27,6 @@ site_name = "jupiter"; publicKey = "smBQYUS60JDkNoqkTT7TgbpqFiM43005fcrT6472llI="; IP = "10.14.2.33"; - lan_endpoint = "192.168.1.33:33799"; endpoint = "82.64.238.84:33733"; } { @@ -37,18 +34,17 @@ site_name = "corrin"; publicKey = "m9rLf+233X1VColmeVrM/xfDGro5W6Gk5N0zqcf32WY="; IP = "10.14.3.1"; - lan_endpoint = "192.168.1.25:33799"; - endpoint = "82.120.233.78:33721"; + #endpoint = "82.120.233.78:33721"; } { hostname = "df-pw5"; site_name = "bespin"; publicKey = "XLOYoMXF+PO4jcgfSVAk+thh4VmWx0wzWnb0xs08G1s="; IP = "10.14.4.1"; - lan_endpoint = "192.168.5.130:33799"; endpoint = "bitfrost.fiber.shirokumo.net:33734"; } ]; + services.wgautomesh.logLevel = "debug"; # Bootstrap IPs for Consul cluster, # these are IPs on the Wireguard overlay diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts index 5f0a144..0cb04f2 100644 --- a/cluster/staging/known_hosts +++ b/cluster/staging/known_hosts @@ -8,3 +8,4 @@ piranha.polyno.me,2a01:cb05:8984:3c00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1 2001:910:1204:1::21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx 2a01:e0a:5e4:1d0:223:24ff:feaf:fdec ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK df-pw5.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeehxeGiZR7qquYGoqEH/YrRJ/ukEcaLH +10.14.3.1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config index b1a02e8..3043207 100644 --- a/cluster/staging/ssh_config +++ b/cluster/staging/ssh_config @@ -10,7 +10,9 @@ Host origan HostName origan.df.trinity.fr.eu.org Host piranha - HostName piranha.polyno.me + ProxyJump caribou.machine.deuxfleurs.fr + HostName 10.14.3.1 + #HostName piranha.polyno.me Host df-pw5 HostName df-pw5.machine.deuxfleurs.fr |