From 26f78872e6d94671381c2b199c643e43a81b8b7f Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 4 Jan 2023 10:02:21 +0100 Subject: [PATCH] staging: add node df-pw5 at bespin --- cluster/staging/cluster.nix | 8 ++++++++ cluster/staging/known_hosts | 1 + cluster/staging/node/df-pw5.nix | 20 ++++++++++++++++++++ cluster/staging/node/df-pw5.site.nix | 1 + cluster/staging/site/bespin.nix | 13 +++++++++++++ cluster/staging/ssh_config | 3 +++ 6 files changed, 46 insertions(+) create mode 100644 cluster/staging/node/df-pw5.nix create mode 120000 cluster/staging/node/df-pw5.site.nix create mode 100644 cluster/staging/site/bespin.nix diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix index c2db0fd..c794298 100644 --- a/cluster/staging/cluster.nix +++ b/cluster/staging/cluster.nix @@ -48,6 +48,14 @@ lan_endpoint = "192.168.1.25:33799"; endpoint = "90.49.20.119: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"; + } ]; # Bootstrap IPs for Consul cluster, diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts index 0413047..5f0a144 100644 --- a/cluster/staging/known_hosts +++ b/cluster/staging/known_hosts @@ -7,3 +7,4 @@ piranha.polyno.me,2a01:cb05:8984:3c00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1 2001:910:1204:1::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ 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 diff --git a/cluster/staging/node/df-pw5.nix b/cluster/staging/node/df-pw5.nix new file mode 100644 index 0000000..33888d6 --- /dev/null +++ b/cluster/staging/node/df-pw5.nix @@ -0,0 +1,20 @@ +# Configuration file local to this node + +{ config, pkgs, ... }: + +{ + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot"; + boot.loader.timeout = 20; + + networking.hostName = "df-pw5"; + + deuxfleurs.network_interface = "eno1"; + deuxfleurs.lan_ip = "192.168.5.130"; + deuxfleurs.ipv6 = "2a02:a03f:6510:5102:223:24ff:feb0:e8a7"; + + deuxfleurs.cluster_ip = "10.14.4.1"; + deuxfleurs.is_raft_server = false; +} diff --git a/cluster/staging/node/df-pw5.site.nix b/cluster/staging/node/df-pw5.site.nix new file mode 120000 index 0000000..24a1723 --- /dev/null +++ b/cluster/staging/node/df-pw5.site.nix @@ -0,0 +1 @@ +../site/bespin.nix \ No newline at end of file diff --git a/cluster/staging/site/bespin.nix b/cluster/staging/site/bespin.nix new file mode 100644 index 0000000..9401f74 --- /dev/null +++ b/cluster/staging/site/bespin.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: + +{ + deuxfleurs.site_name = "bespin"; + deuxfleurs.lan_default_gateway = "192.168.5.254"; + deuxfleurs.ipv6_default_gateway = "2a02:a03f:6510:5102::1"; + deuxfleurs.lan_ip_prefix_length = 24; + deuxfleurs.ipv6_prefix_length = 64; + deuxfleurs.nameservers = [ "192.168.5.254" ]; + deuxfleurs.cname_target = "bespin.site.staging.deuxfleurs.org."; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config index c8860a4..36c5803 100644 --- a/cluster/staging/ssh_config +++ b/cluster/staging/ssh_config @@ -14,3 +14,6 @@ Host origan Host piranha HostName piranha.polyno.me + +Host df-pw5 + HostName df-pw5.machine.deuxfleurs.fr