aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cluster/prod/cluster.nix6
-rw-r--r--cluster/prod/known_hosts3
-rw-r--r--cluster/prod/node/ananas.nix15
l---------cluster/prod/node/ananas.site.nix1
-rw-r--r--cluster/prod/node/dahlia.nix1
-rw-r--r--cluster/prod/ssh_config4
6 files changed, 27 insertions, 3 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index ea3bdec..e6f71e0 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -67,6 +67,12 @@
address = "10.83.4.1";
endpoint = "82.65.41.110:33741";
};
+ "ananas" = {
+ siteName = "scorpio";
+ publicKey = "YC78bXUaAQ02gz0bApenM4phIo/oMPR78QCmyG0tay4=";
+ address = "10.83.4.2";
+ endpoint = "82.65.41.110:33742";
+ };
};
# Bootstrap IPs for Consul cluster,
diff --git a/cluster/prod/known_hosts b/cluster/prod/known_hosts
index 3d72c39..1c80749 100644
--- a/cluster/prod/known_hosts
+++ b/cluster/prod/known_hosts
@@ -7,6 +7,5 @@ df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+
celeri.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA
concombre.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR
courgette.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G
-192.168.1.115 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
-192.168.1.41 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
abricot.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPhHUQtc5lukPMFkiWf/sTgaUpwNFXHCJoQKu4ooRFy+
+ananas.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHs0zAyBy70oyV56qaMaMAKR7VjEDnsm5LEyZJbM95BL
diff --git a/cluster/prod/node/ananas.nix b/cluster/prod/node/ananas.nix
new file mode 100644
index 0000000..50ee3d5
--- /dev/null
+++ b/cluster/prod/node/ananas.nix
@@ -0,0 +1,15 @@
+# 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;
+
+ deuxfleurs.hostName = "ananas";
+ deuxfleurs.staticIPv4.address = "192.168.1.42";
+ deuxfleurs.staticIPv6.address = "2a01:e0a:e4:2dd0::42";
+ deuxfleurs.isRaftServer = true;
+}
diff --git a/cluster/prod/node/ananas.site.nix b/cluster/prod/node/ananas.site.nix
new file mode 120000
index 0000000..a549793
--- /dev/null
+++ b/cluster/prod/node/ananas.site.nix
@@ -0,0 +1 @@
+../site/scorpio.nix \ No newline at end of file
diff --git a/cluster/prod/node/dahlia.nix b/cluster/prod/node/dahlia.nix
index ee9e7aa..121a34d 100644
--- a/cluster/prod/node/dahlia.nix
+++ b/cluster/prod/node/dahlia.nix
@@ -10,5 +10,4 @@
deuxfleurs.hostName = "dahlia";
deuxfleurs.staticIPv4.address = "192.168.1.11";
deuxfleurs.staticIPv6.address = "2a01:e0a:28f:5e60::11";
- deuxfleurs.isRaftServer = true;
}
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index 5780381..37b8953 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -29,3 +29,7 @@ Host df-ymk
Host abricot
HostName abricot.machine.deuxfleurs.fr
+
+Host ananas
+ HostName ananas.machine.deuxfleurs.fr
+