diff options
| author | Baptiste Jonglez <git@bitsofnetworks.org> | 2022-12-28 16:49:43 +0100 |
|---|---|---|
| committer | Baptiste Jonglez <git@bitsofnetworks.org> | 2022-12-28 16:49:43 +0100 |
| commit | 1c48fd4ae446fd649833645ff4710faa09e9b642 (patch) | |
| tree | 3dc734e56eb2e3f57f9abe62aba029f41091f895 | |
| parent | b63c03f6355aacd436058c0fd9f2bdb622b85f93 (diff) | |
| download | nixcfg-1c48fd4ae446fd649833645ff4710faa09e9b642.tar.gz nixcfg-1c48fd4ae446fd649833645ff4710faa09e9b642.zip | |
Add new staging zone and node
| -rw-r--r-- | cluster/staging/cluster.nix | 8 | ||||
| -rw-r--r-- | cluster/staging/known_hosts | 5 | ||||
| -rw-r--r-- | cluster/staging/node/piranha.nix | 21 | ||||
| l--------- | cluster/staging/node/piranha.site.nix | 1 | ||||
| -rw-r--r-- | cluster/staging/site/corrin.nix | 14 | ||||
| -rw-r--r-- | cluster/staging/ssh_config | 3 |
6 files changed, 52 insertions, 0 deletions
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix index 54e4cd8..c2db0fd 100644 --- a/cluster/staging/cluster.nix +++ b/cluster/staging/cluster.nix @@ -40,6 +40,14 @@ lan_endpoint = "192.168.1.33:33799"; endpoint = "82.64.238.84:33733"; } + { + hostname = "piranha"; + site_name = "corrin"; + publicKey = "m9rLf+233X1VColmeVrM/xfDGro5W6Gk5N0zqcf32WY="; + IP = "10.14.3.1"; + lan_endpoint = "192.168.1.25:33799"; + endpoint = "90.49.20.119:33721"; + } ]; # Bootstrap IPs for Consul cluster, diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts index 68f25c0..0413047 100644 --- a/cluster/staging/known_hosts +++ b/cluster/staging/known_hosts @@ -2,3 +2,8 @@ carcajou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19S cariacou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx caribou.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22 origan.df.trinity.fr.eu.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK +piranha.polyno.me,2a01:cb05:8984:3c00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co +2001:910:1204:1::23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22 +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 diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix new file mode 100644 index 0000000..22f8108 --- /dev/null +++ b/cluster/staging/node/piranha.nix @@ -0,0 +1,21 @@ +# Configuration file local to this node + +{ config, pkgs, ... }: + +{ + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.timeout = 20; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "piranha"; + + deuxfleurs.network_interface = "eno1"; + deuxfleurs.lan_ip = "192.168.1.25"; + deuxfleurs.ipv6 = "2a01:cb05:8984:3c00:223:24ff:feb0:ea82"; + + deuxfleurs.cluster_ip = "10.14.3.1"; + deuxfleurs.is_raft_server = false; + + system.stateVersion = "22.11"; +} diff --git a/cluster/staging/node/piranha.site.nix b/cluster/staging/node/piranha.site.nix new file mode 120000 index 0000000..0a97c41 --- /dev/null +++ b/cluster/staging/node/piranha.site.nix @@ -0,0 +1 @@ +../site/corrin.nix
\ No newline at end of file diff --git a/cluster/staging/site/corrin.nix b/cluster/staging/site/corrin.nix new file mode 100644 index 0000000..98151f0 --- /dev/null +++ b/cluster/staging/site/corrin.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + deuxfleurs.site_name = "corrin"; + deuxfleurs.lan_default_gateway = "192.168.1.1"; + deuxfleurs.ipv6_default_gateway = "fe80::7ec1:77ff:fe3e:bb90"; + deuxfleurs.lan_ip_prefix_length = 24; + deuxfleurs.ipv6_prefix_length = 64; + deuxfleurs.nameservers = [ "192.168.1.1" ]; + deuxfleurs.cname_target = "corrin.site.staging.deuxfleurs.org."; + deuxfleurs.public_ipv4 = "90.49.20.119"; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; +} diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config index e1eecc3..c8860a4 100644 --- a/cluster/staging/ssh_config +++ b/cluster/staging/ssh_config @@ -11,3 +11,6 @@ Host cariacou Host origan HostName origan.df.trinity.fr.eu.org + +Host piranha + HostName piranha.polyno.me |