aboutsummaryrefslogtreecommitdiff
path: root/cluster
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-05-08 14:42:18 +0200
committerAlex Auvolat <alex@adnab.me>2022-05-08 14:42:18 +0200
commit83dd3ea25ac7ded159105e2501b438dac4e01e22 (patch)
treef53a75ac8c35133f090fddd20c9a1f1b44cf909c /cluster
parent397a3fdfa9d9f9fd279ca45dee592d1b0c157b69 (diff)
downloadnixcfg-83dd3ea25ac7ded159105e2501b438dac4e01e22.tar.gz
nixcfg-83dd3ea25ac7ded159105e2501b438dac4e01e22.zip
Update network configuration
Diffstat (limited to 'cluster')
-rw-r--r--cluster/prod/cluster.nix6
-rw-r--r--cluster/prod/site/neptune.nix4
-rw-r--r--cluster/prod/ssh_config9
-rw-r--r--cluster/staging/cluster.nix6
-rw-r--r--cluster/staging/site/neptune.nix4
-rw-r--r--cluster/staging/ssh_config9
6 files changed, 22 insertions, 16 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index ece401e..1bf4a7b 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -5,9 +5,9 @@
# Bootstrap nodes for Wesher overlay network
services.wesher.join = [
- "2a01:e0a:c:a720::31" # concombre
- "2a01:e0a:c:a720::32" # courgette
- "2a01:e0a:c:a720::33" # celeri
+ "192.168.1.31" # concombre
+ "192.168.1.32" # courgette
+ "192.168.1.33" # celeri
];
# The IP range to use for the Wesher overlay of this cluster
diff --git a/cluster/prod/site/neptune.nix b/cluster/prod/site/neptune.nix
index 6e69b18..3770c2f 100644
--- a/cluster/prod/site/neptune.nix
+++ b/cluster/prod/site/neptune.nix
@@ -2,11 +2,11 @@
{
deuxfleurs.site_name = "neptune";
- deuxfleurs.lan_default_gateway = "192.168.1.254";
+ deuxfleurs.lan_default_gateway = "192.168.1.1";
deuxfleurs.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64;
- networking.nameservers = [ "192.168.1.254" ];
+ networking.nameservers = [ "192.168.1.1" ];
networking.firewall.allowedTCPPorts = [ 80 443 ];
}
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index cb4841f..d05e5c6 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -1,10 +1,13 @@
UserKnownHostsFile ./ssh_known_hosts
Host concombre
- HostName 2a01:e0a:c:a720::31
+ #HostName 2a01:e0a:c:a720::31
+ HostName 192.168.1.31
Host courgette
- HostName 2a01:e0a:c:a720::32
+ #HostName 2a01:e0a:c:a720::32
+ HostName 192.168.1.32
Host celeri
- HostName 2a01:e0a:c:a720::33
+ #HostName 2a01:e0a:c:a720::33
+ HostName 192.168.1.33
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 2ad79bf..0836dcb 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -5,9 +5,9 @@
# Bootstrap nodes for Wesher overlay network
services.wesher.join = [
- "2a01:e0a:c:a720::21" # cariacou
- "2a01:e0a:c:a720::22" # carcajou
- "2a01:e0a:c:a720::23" # caribou
+ "192.168.1.21" # cariacou
+ "192.168.1.22" # carcajou
+ "192.168.1.23" # caribou
];
# The IP range to use for the Wesher overlay of this cluster
diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix
index 38a4bab..034c634 100644
--- a/cluster/staging/site/neptune.nix
+++ b/cluster/staging/site/neptune.nix
@@ -2,11 +2,11 @@
{
deuxfleurs.site_name = "neptune";
- deuxfleurs.lan_default_gateway = "192.168.1.254";
+ deuxfleurs.lan_default_gateway = "192.168.1.1";
deuxfleurs.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64;
- networking.nameservers = [ "192.168.1.254" ];
+ networking.nameservers = [ "192.168.1.1" ];
networking.firewall.allowedTCPPorts = [ 80 443 ];
diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config
index 9bc4e6e..3360725 100644
--- a/cluster/staging/ssh_config
+++ b/cluster/staging/ssh_config
@@ -1,13 +1,16 @@
UserKnownHostsFile ./ssh_known_hosts
Host caribou
- HostName 2a01:e0a:c:a720::23
+ #HostName 2a01:e0a:c:a720::23
+ HostName 192.168.1.23
Host carcajou
- HostName 2a01:e0a:c:a720::22
+ #HostName 2a01:e0a:c:a720::22
+ HostName 192.168.1.22
Host cariacou
- HostName 2a01:e0a:c:a720::21
+ #HostName 2a01:e0a:c:a720::21
+ HostName 192.168.1.21
Host spoutnik
HostName 10.42.0.2