aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cluster/prod/node/celeri.nix2
-rw-r--r--cluster/prod/node/concombre.nix2
-rw-r--r--cluster/prod/node/courgette.nix2
-rw-r--r--cluster/prod/site/neptune.nix2
-rw-r--r--cluster/prod/ssh_config6
-rw-r--r--cluster/staging/node/carcajou.nix2
-rw-r--r--cluster/staging/node/cariacou.nix2
-rw-r--r--cluster/staging/node/caribou.nix2
-rw-r--r--cluster/staging/node/spoutnik.nix.unavailable58
l---------cluster/staging/node/spoutnik.site.nix1
-rw-r--r--cluster/staging/site/neptune.nix2
-rw-r--r--cluster/staging/site/pluton.nix11
-rw-r--r--ssh_known_hosts3
13 files changed, 14 insertions, 81 deletions
diff --git a/cluster/prod/node/celeri.nix b/cluster/prod/node/celeri.nix
index eceeb8f..d20ade1 100644
--- a/cluster/prod/node/celeri.nix
+++ b/cluster/prod/node/celeri.nix
@@ -12,7 +12,7 @@
deuxfleurs.network_interface = "eno1";
deuxfleurs.lan_ip = "192.168.1.33";
- deuxfleurs.ipv6 = "2a06:a003:515d:1::33";
+ deuxfleurs.ipv6 = "2a06:a003:d019:1::33";
deuxfleurs.cluster_ip = "10.83.1.3";
deuxfleurs.is_raft_server = true;
diff --git a/cluster/prod/node/concombre.nix b/cluster/prod/node/concombre.nix
index 525ae01..9df7efd 100644
--- a/cluster/prod/node/concombre.nix
+++ b/cluster/prod/node/concombre.nix
@@ -12,7 +12,7 @@
deuxfleurs.network_interface = "eno1";
deuxfleurs.lan_ip = "192.168.1.31";
- deuxfleurs.ipv6 = "2a06:a003:515d:1::31";
+ deuxfleurs.ipv6 = "2a06:a003:d019:1::31";
deuxfleurs.cluster_ip = "10.83.1.1";
deuxfleurs.is_raft_server = true;
diff --git a/cluster/prod/node/courgette.nix b/cluster/prod/node/courgette.nix
index cddaed1..885997d 100644
--- a/cluster/prod/node/courgette.nix
+++ b/cluster/prod/node/courgette.nix
@@ -12,7 +12,7 @@
deuxfleurs.network_interface = "eno1";
deuxfleurs.lan_ip = "192.168.1.32";
- deuxfleurs.ipv6 = "2a06:a003:515d:1::32";
+ deuxfleurs.ipv6 = "2a06:a003:d019:1::32";
deuxfleurs.cluster_ip = "10.83.1.2";
deuxfleurs.is_raft_server = false;
diff --git a/cluster/prod/site/neptune.nix b/cluster/prod/site/neptune.nix
index 477e660..d08a30c 100644
--- a/cluster/prod/site/neptune.nix
+++ b/cluster/prod/site/neptune.nix
@@ -3,7 +3,7 @@
{
deuxfleurs.site_name = "neptune";
deuxfleurs.lan_default_gateway = "192.168.1.1";
- deuxfleurs.ipv6_default_gateway = "2a06:a003:515d:1::1";
+ deuxfleurs.ipv6_default_gateway = "2a06:a003:d019:1::1";
deuxfleurs.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64;
deuxfleurs.nameservers = [ "192.168.1.1" ];
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index 61dd364..7512bda 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -1,15 +1,15 @@
UserKnownHostsFile ./ssh_known_hosts
Host concombre
- HostName 2a06:a003:515d:1::31
+ HostName 2a06:a003:d019:1::31
#HostName 192.168.1.31
Host courgette
- HostName 2a06:a003:515d:1::32
+ HostName 2a06:a003:d019:1::32
#HostName 192.168.1.32
Host celeri
- HostName 2a06:a003:515d:1::33
+ HostName 2a06:a003:d019:1::33
#HostName 192.168.1.33
Host dahlia
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
diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix
index 1e3a440..509909c 100644
--- a/cluster/staging/site/neptune.nix
+++ b/cluster/staging/site/neptune.nix
@@ -3,7 +3,7 @@
{
deuxfleurs.site_name = "neptune";
deuxfleurs.lan_default_gateway = "192.168.1.1";
- deuxfleurs.ipv6_default_gateway = "2a06:a003:515d:1::1";
+ deuxfleurs.ipv6_default_gateway = "2a06:a003:d019:1::1";
deuxfleurs.lan_ip_prefix_length = 24;
deuxfleurs.ipv6_prefix_length = 64;
deuxfleurs.nameservers = [ "192.168.1.1" ];
diff --git a/cluster/staging/site/pluton.nix b/cluster/staging/site/pluton.nix
deleted file mode 100644
index 570cdd8..0000000
--- a/cluster/staging/site/pluton.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- deuxfleurs.site_name = "pluton";
- deuxfleurs.lan_default_gateqay = "192.168.0.1";
- deuxfleurs.lan_ip_prefix_length = 24;
- deuxfleurs.ipv6_prefix_length = 64;
- deuxfleurs.nameservers = [ "213.186.33.99" "172.104.136.243" ];
-
- networking.firewall.allowedTCPPorts = [ 80 443 ];
-}
diff --git a/ssh_known_hosts b/ssh_known_hosts
index 91c2ad1..e6baaa5 100644
--- a/ssh_known_hosts
+++ b/ssh_known_hosts
@@ -15,3 +15,6 @@ diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti
2a06:a003:515d:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
2a06:a003:515d:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
2a06:a003:515d:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
+2a06:a003:d019:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
+2a06:a003:d019:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
+2a06:a003:d019:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:35:15 +0000