From 39fbbbe8639c7ad646a1e92efae7c1ee3818922a Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 9 Sep 2022 17:23:23 +0200 Subject: [PATCH] Change ipv6 tunnel server --- cluster/prod/node/celeri.nix | 2 +- cluster/prod/node/concombre.nix | 2 +- cluster/prod/node/courgette.nix | 2 +- cluster/prod/site/neptune.nix | 2 +- cluster/prod/ssh_config | 6 +++--- cluster/staging/node/carcajou.nix | 2 +- cluster/staging/node/cariacou.nix | 2 +- cluster/staging/node/caribou.nix | 2 +- cluster/staging/site/neptune.nix | 2 +- ssh_known_hosts | 3 +++ 10 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cluster/prod/node/celeri.nix b/cluster/prod/node/celeri.nix index 56f1f7e..eceeb8f 100644 --- a/cluster/prod/node/celeri.nix +++ b/cluster/prod/node/celeri.nix @@ -12,7 +12,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.33"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::33"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::33"; deuxfleurs.cluster_ip = "10.83.1.3"; deuxfleurs.is_raft_server = true; diff --git a/cluster/prod/node/concombre.nix b/cluster/prod/node/concombre.nix index 8b82cb9..525ae01 100644 --- a/cluster/prod/node/concombre.nix +++ b/cluster/prod/node/concombre.nix @@ -12,7 +12,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.31"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::31"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::31"; deuxfleurs.cluster_ip = "10.83.1.1"; deuxfleurs.is_raft_server = true; diff --git a/cluster/prod/node/courgette.nix b/cluster/prod/node/courgette.nix index de3b92e..cddaed1 100644 --- a/cluster/prod/node/courgette.nix +++ b/cluster/prod/node/courgette.nix @@ -12,7 +12,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.32"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::32"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::32"; deuxfleurs.cluster_ip = "10.83.1.2"; deuxfleurs.is_raft_server = false; diff --git a/cluster/prod/site/neptune.nix b/cluster/prod/site/neptune.nix index 5434bd5..477e660 100644 --- a/cluster/prod/site/neptune.nix +++ b/cluster/prod/site/neptune.nix @@ -3,7 +3,7 @@ { deuxfleurs.site_name = "neptune"; deuxfleurs.lan_default_gateway = "192.168.1.1"; - deuxfleurs.ipv6_default_gateway = "2a06:a004:3025:1::1"; + deuxfleurs.ipv6_default_gateway = "2a06:a003:515d:1::1"; deuxfleurs.lan_ip_prefix_length = 24; deuxfleurs.ipv6_prefix_length = 64; deuxfleurs.nameservers = [ "192.168.1.1" ]; diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config index afae310..61dd364 100644 --- a/cluster/prod/ssh_config +++ b/cluster/prod/ssh_config @@ -1,15 +1,15 @@ UserKnownHostsFile ./ssh_known_hosts Host concombre - HostName 2a06:a004:3025:1::31 + HostName 2a06:a003:515d:1::31 #HostName 192.168.1.31 Host courgette - HostName 2a06:a004:3025:1::32 + HostName 2a06:a003:515d:1::32 #HostName 192.168.1.32 Host celeri - HostName 2a06:a004:3025:1::33 + HostName 2a06:a003:515d:1::33 #HostName 192.168.1.33 Host dahlia diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix index f7d9001..65766f3 100644 --- a/cluster/staging/node/carcajou.nix +++ b/cluster/staging/node/carcajou.nix @@ -17,7 +17,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.22"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::22"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::22"; deuxfleurs.cluster_ip = "10.14.1.2"; deuxfleurs.is_raft_server = true; diff --git a/cluster/staging/node/cariacou.nix b/cluster/staging/node/cariacou.nix index 1f237ab..2d212b5 100644 --- a/cluster/staging/node/cariacou.nix +++ b/cluster/staging/node/cariacou.nix @@ -17,7 +17,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.21"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::21"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::21"; deuxfleurs.cluster_ip = "10.14.1.1"; deuxfleurs.is_raft_server = true; diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix index d24ace6..64e86cc 100644 --- a/cluster/staging/node/caribou.nix +++ b/cluster/staging/node/caribou.nix @@ -17,7 +17,7 @@ deuxfleurs.network_interface = "eno1"; deuxfleurs.lan_ip = "192.168.1.23"; - deuxfleurs.ipv6 = "2a06:a004:3025:1::23"; + deuxfleurs.ipv6 = "2a06:a003:515d:1::23"; deuxfleurs.cluster_ip = "10.14.1.3"; deuxfleurs.is_raft_server = true; diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix index 76373ab..1e3a440 100644 --- a/cluster/staging/site/neptune.nix +++ b/cluster/staging/site/neptune.nix @@ -3,7 +3,7 @@ { deuxfleurs.site_name = "neptune"; deuxfleurs.lan_default_gateway = "192.168.1.1"; - deuxfleurs.ipv6_default_gateway = "2a06:a004:3025:1::1"; + deuxfleurs.ipv6_default_gateway = "2a06:a003:515d:1::1"; deuxfleurs.lan_ip_prefix_length = 24; deuxfleurs.ipv6_prefix_length = 64; deuxfleurs.nameservers = [ "192.168.1.1" ]; diff --git a/ssh_known_hosts b/ssh_known_hosts index 335555b..91c2ad1 100644 --- a/ssh_known_hosts +++ b/ssh_known_hosts @@ -12,3 +12,6 @@ diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti 2a06:a004:3025:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 2a06:a004:3025:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR 2a06:a004:3025:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G +2a06:a003:515d:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA +2a06:a003:515d:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR +2a06:a003:515d:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G