From c239e34a2521d101e060da6251c5d3562bc72329 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 9 Oct 2022 17:07:47 +0200 Subject: IPv6 prefix at Neptune changed again --- cluster/staging/node/carcajou.nix | 2 +- cluster/staging/node/cariacou.nix | 2 +- cluster/staging/node/caribou.nix | 2 +- cluster/staging/node/spoutnik.nix.unavailable | 58 --------------------------- cluster/staging/node/spoutnik.site.nix | 1 - 5 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 cluster/staging/node/spoutnik.nix.unavailable delete mode 120000 cluster/staging/node/spoutnik.site.nix (limited to 'cluster/staging/node') diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix index 1eeb48a..02307bc 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:a003:515d:1::22"; + deuxfleurs.ipv6 = "2a06:a003:d019: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 cb174f7..c2180e9 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:a003:515d:1::21"; + deuxfleurs.ipv6 = "2a06:a003:d019: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 38c9983..137aab7 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:a003:515d:1::23"; + deuxfleurs.ipv6 = "2a06:a003:d019:1::23"; deuxfleurs.cluster_ip = "10.14.1.3"; deuxfleurs.is_raft_server = true; diff --git a/cluster/staging/node/spoutnik.nix.unavailable b/cluster/staging/node/spoutnik.nix.unavailable deleted file mode 100644 index 060d77d..0000000 --- a/cluster/staging/node/spoutnik.nix.unavailable +++ /dev/null @@ -1,58 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - networking.hostName = "spoutnik"; - services.openssh.ports = [ 220 ]; - - deuxfleurs.network_interface = "enp0s25"; - deuxfleurs.lan_ip = "192.168.0.40"; - deuxfleurs.ipv6 = "::"; #TODO - - deuxfleurs.cluster_ip = "10.14.0.0"; - deuxfleurs.is_raft_server = false; #TODO - - # Nginx configuration: - - services.nginx = { - enable = true; - - # Use recommended settings - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - - # Add any further config to match your needs, e.g.: - virtualHosts = let - base = locations: { - inherit locations; - - forceSSL = true; - enableACME = true; - }; - proxy = addr: port: base { - "/".proxyPass = "http://" + addr + ":" + toString(port); - }; - in { - "axl.deuxfleurs.fr" = proxy "192.168.0.60" 80; - "warez.luxeylab.net" = proxy "192.168.0.50" 80; - }; - }; - - - # ACME: - - security.acme = { - acceptTerms = true; - email = "adrien@luxeylab.net"; - }; -} - diff --git a/cluster/staging/node/spoutnik.site.nix b/cluster/staging/node/spoutnik.site.nix deleted file mode 120000 index 87c7991..0000000 --- a/cluster/staging/node/spoutnik.site.nix +++ /dev/null @@ -1 +0,0 @@ -../site/pluton.nix \ No newline at end of file -- cgit v1.2.3