Update network configuration

This commit is contained in:
Alex 2022-05-08 14:42:18 +02:00
parent 397a3fdfa9
commit 83dd3ea25a
Signed by: lx
GPG key ID: 0E496D15096376BE
8 changed files with 29 additions and 17 deletions

View file

@ -5,9 +5,9 @@
# Bootstrap nodes for Wesher overlay network # Bootstrap nodes for Wesher overlay network
services.wesher.join = [ services.wesher.join = [
"2a01:e0a:c:a720::31" # concombre "192.168.1.31" # concombre
"2a01:e0a:c:a720::32" # courgette "192.168.1.32" # courgette
"2a01:e0a:c:a720::33" # celeri "192.168.1.33" # celeri
]; ];
# The IP range to use for the Wesher overlay of this cluster # The IP range to use for the Wesher overlay of this cluster

View file

@ -2,11 +2,11 @@
{ {
deuxfleurs.site_name = "neptune"; 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.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64; deuxfleurs.ipv6_prefix_length = 64;
networking.nameservers = [ "192.168.1.254" ]; networking.nameservers = [ "192.168.1.1" ];
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];
} }

View file

@ -1,10 +1,13 @@
UserKnownHostsFile ./ssh_known_hosts UserKnownHostsFile ./ssh_known_hosts
Host concombre Host concombre
HostName 2a01:e0a:c:a720::31 #HostName 2a01:e0a:c:a720::31
HostName 192.168.1.31
Host courgette Host courgette
HostName 2a01:e0a:c:a720::32 #HostName 2a01:e0a:c:a720::32
HostName 192.168.1.32
Host celeri Host celeri
HostName 2a01:e0a:c:a720::33 #HostName 2a01:e0a:c:a720::33
HostName 192.168.1.33

View file

@ -5,9 +5,9 @@
# Bootstrap nodes for Wesher overlay network # Bootstrap nodes for Wesher overlay network
services.wesher.join = [ services.wesher.join = [
"2a01:e0a:c:a720::21" # cariacou "192.168.1.21" # cariacou
"2a01:e0a:c:a720::22" # carcajou "192.168.1.22" # carcajou
"2a01:e0a:c:a720::23" # caribou "192.168.1.23" # caribou
]; ];
# The IP range to use for the Wesher overlay of this cluster # The IP range to use for the Wesher overlay of this cluster

View file

@ -2,11 +2,11 @@
{ {
deuxfleurs.site_name = "neptune"; 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.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64; deuxfleurs.ipv6_prefix_length = 64;
networking.nameservers = [ "192.168.1.254" ]; networking.nameservers = [ "192.168.1.1" ];
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];

View file

@ -1,13 +1,16 @@
UserKnownHostsFile ./ssh_known_hosts UserKnownHostsFile ./ssh_known_hosts
Host caribou Host caribou
HostName 2a01:e0a:c:a720::23 #HostName 2a01:e0a:c:a720::23
HostName 192.168.1.23
Host carcajou Host carcajou
HostName 2a01:e0a:c:a720::22 #HostName 2a01:e0a:c:a720::22
HostName 192.168.1.22
Host cariacou Host cariacou
HostName 2a01:e0a:c:a720::21 #HostName 2a01:e0a:c:a720::21
HostName 192.168.1.21
Host spoutnik Host spoutnik
HostName 10.42.0.2 HostName 10.42.0.2

View file

@ -104,7 +104,7 @@ in
# wesher overlay network # wesher overlay network
services.wesher = { services.wesher = {
enable = true; enable = true;
bindAddr = cfg.ipv6; bindIface = cfg.network_interface;
overlayNet = "${cfg.wesher_cluster_prefix}/${toString cfg.wesher_cluster_prefix_length}"; overlayNet = "${cfg.wesher_cluster_prefix}/${toString cfg.wesher_cluster_prefix_length}";
interface = "wg0"; interface = "wg0";
logLevel = "debug"; logLevel = "debug";

View file

@ -12,3 +12,9 @@
2a01:e0a:c:a720::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 2a01:e0a:c:a720::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
2a01:e0a:c:a720::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR 2a01:e0a:c:a720::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
2a01:e0a:c:a720::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G 2a01:e0a:c:a720::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
192.168.1.22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
192.168.1.21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx
192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDsYD1gNmGyb6c9wjGR6tC69fHP6+FpPHTBT6laPTHeD
192.168.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
192.168.1.31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
192.168.1.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G