aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cluster/prod/cluster.nix6
-rw-r--r--cluster/prod/known_hosts1
-rw-r--r--cluster/prod/node/ortie.nix12
l---------cluster/prod/node/ortie.site.nix1
-rw-r--r--cluster/prod/ssh_config3
-rw-r--r--cluster/staging/app/ci/deploy/albatros.hcl2
-rw-r--r--cluster/staging/app/ci/deploy/builder.hcl2
-rw-r--r--cluster/staging/app/core/deploy/d53.hcl2
-rw-r--r--cluster/staging/app/core/deploy/diplonat.hcl2
-rw-r--r--cluster/staging/app/core/deploy/tricot.hcl2
-rw-r--r--cluster/staging/app/garage/deploy/garage.hcl2
-rw-r--r--cluster/staging/app/telemetry/deploy/telemetry-service.hcl2
-rw-r--r--cluster/staging/app/telemetry/deploy/telemetry-system.hcl2
-rw-r--r--cluster/staging/cluster.nix2
-rw-r--r--cluster/staging/node/origan.nix5
l---------cluster/staging/node/origan.site.nix2
-rw-r--r--cluster/staging/site/dathomir.nix6
-rw-r--r--cluster/staging/site/jupiter.nix7
18 files changed, 40 insertions, 21 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index c5008e6..ddb9813 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -93,6 +93,12 @@
address = "10.83.5.3";
endpoint = "82.64.238.84:33742";
};
+ "ortie" = {
+ siteName = "dathomir";
+ publicKey = "tbx2mvt3TN3Xd+ermwwZ6it80VWT5949cKH9BRFgvzE=";
+ address = "10.83.5.4";
+ endpoint = "82.64.238.84:33743";
+ };
};
# Pin Nomad version
diff --git a/cluster/prod/known_hosts b/cluster/prod/known_hosts
index 3b6bf7f..3475b9d 100644
--- a/cluster/prod/known_hosts
+++ b/cluster/prod/known_hosts
@@ -12,3 +12,4 @@ ananas.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHs0zAyBy70oyV5
onion.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjBQ67fxwuDDzRPveTko/Sgf0cev3tIvlr3CfAmhF0C
oseille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAgQdQ5UVFFn+DXN90ut9+V7NtEopQJnES3r8soKTZW4
io.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIvgCJ7Jew7ou1RZuaT41Sd+ucZAgxUwtdieqNqoC3+T
+ortie.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqtfIPLk8a5tM6Upj7GQwlIS16nBPrZYVXE2FVlO2Yn
diff --git a/cluster/prod/node/ortie.nix b/cluster/prod/node/ortie.nix
new file mode 100644
index 0000000..e71e8d3
--- /dev/null
+++ b/cluster/prod/node/ortie.nix
@@ -0,0 +1,12 @@
+{ ... }:
+{
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.timeout = 20;
+ boot.loader.efi.canTouchEfiVariables = true;
+
+ services.openssh.ports = [ 22 33604 ];
+
+ deuxfleurs.hostName = "ortie";
+ deuxfleurs.staticIPv4.address = "192.168.1.37";
+ deuxfleurs.staticIPv6.address = "2a01:e0a:5e4:1d0:223:24ff:feb0:1b9";
+}
diff --git a/cluster/prod/node/ortie.site.nix b/cluster/prod/node/ortie.site.nix
new file mode 120000
index 0000000..5e41391
--- /dev/null
+++ b/cluster/prod/node/ortie.site.nix
@@ -0,0 +1 @@
+../site/dathomir.nix \ No newline at end of file
diff --git a/cluster/prod/ssh_config b/cluster/prod/ssh_config
index d7aeafd..62517d2 100644
--- a/cluster/prod/ssh_config
+++ b/cluster/prod/ssh_config
@@ -41,3 +41,6 @@ Host oseille
Host io
HostName io.machine.deuxfleurs.fr
+
+Host ortie
+ HostName ortie.machine.deuxfleurs.fr
diff --git a/cluster/staging/app/ci/deploy/albatros.hcl b/cluster/staging/app/ci/deploy/albatros.hcl
index cfe5369..6c2f209 100644
--- a/cluster/staging/app/ci/deploy/albatros.hcl
+++ b/cluster/staging/app/ci/deploy/albatros.hcl
@@ -1,5 +1,5 @@
job "albatros" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service"
priority = 90
diff --git a/cluster/staging/app/ci/deploy/builder.hcl b/cluster/staging/app/ci/deploy/builder.hcl
index ad7a716..cc0a24c 100644
--- a/cluster/staging/app/ci/deploy/builder.hcl
+++ b/cluster/staging/app/ci/deploy/builder.hcl
@@ -2,7 +2,7 @@ job "builder" {
namespace = "ci"
type = "batch"
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
priority = 100
parameterized {
diff --git a/cluster/staging/app/core/deploy/d53.hcl b/cluster/staging/app/core/deploy/d53.hcl
index d8dbed7..2fb86c0 100644
--- a/cluster/staging/app/core/deploy/d53.hcl
+++ b/cluster/staging/app/core/deploy/d53.hcl
@@ -1,5 +1,5 @@
job "core-d53" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service"
priority = 90
diff --git a/cluster/staging/app/core/deploy/diplonat.hcl b/cluster/staging/app/core/deploy/diplonat.hcl
index 3e3310f..160004f 100644
--- a/cluster/staging/app/core/deploy/diplonat.hcl
+++ b/cluster/staging/app/core/deploy/diplonat.hcl
@@ -1,5 +1,5 @@
job "core-diplonat" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system"
priority = 90
diff --git a/cluster/staging/app/core/deploy/tricot.hcl b/cluster/staging/app/core/deploy/tricot.hcl
index 7227c6f..54be69f 100644
--- a/cluster/staging/app/core/deploy/tricot.hcl
+++ b/cluster/staging/app/core/deploy/tricot.hcl
@@ -1,5 +1,5 @@
job "core-tricot" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system"
priority = 90
diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl
index 0ffb277..f0b164e 100644
--- a/cluster/staging/app/garage/deploy/garage.hcl
+++ b/cluster/staging/app/garage/deploy/garage.hcl
@@ -1,5 +1,5 @@
job "garage-staging" {
- datacenters = [ "neptune", "jupiter", "corrin", "bespin" ]
+ datacenters = [ "neptune", "dathomir", "corrin", "bespin" ]
type = "system"
priority = 90
diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
index ec68aaf..99af2a4 100644
--- a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
+++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
@@ -1,5 +1,5 @@
job "telemetry-service" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service"
group "prometheus" {
diff --git a/cluster/staging/app/telemetry/deploy/telemetry-system.hcl b/cluster/staging/app/telemetry/deploy/telemetry-system.hcl
index cd9b8a8..a97c7b1 100644
--- a/cluster/staging/app/telemetry/deploy/telemetry-system.hcl
+++ b/cluster/staging/app/telemetry/deploy/telemetry-system.hcl
@@ -1,5 +1,5 @@
job "telemetry-system" {
- datacenters = ["neptune", "jupiter", "corrin", "bespin"]
+ datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system"
priority = "100"
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 184092f..b170162 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -14,7 +14,7 @@
endpoint = "77.207.15.215:33723";
};
"origan" = {
- siteName = "jupiter";
+ siteName = "dathomir";
publicKey = "smBQYUS60JDkNoqkTT7TgbpqFiM43005fcrT6472llI=";
address = "10.14.2.33";
endpoint = "82.64.238.84:33733";
diff --git a/cluster/staging/node/origan.nix b/cluster/staging/node/origan.nix
index 49ecbbf..2cc4791 100644
--- a/cluster/staging/node/origan.nix
+++ b/cluster/staging/node/origan.nix
@@ -1,7 +1,4 @@
-# Configuration file local to this node
-
-{ config, pkgs, ... }:
-
+{ ... }:
{
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
diff --git a/cluster/staging/node/origan.site.nix b/cluster/staging/node/origan.site.nix
index 7cdd625..5e41391 120000
--- a/cluster/staging/node/origan.site.nix
+++ b/cluster/staging/node/origan.site.nix
@@ -1 +1 @@
-../site/jupiter.nix \ No newline at end of file
+../site/dathomir.nix \ No newline at end of file
diff --git a/cluster/staging/site/dathomir.nix b/cluster/staging/site/dathomir.nix
new file mode 100644
index 0000000..4d45b53
--- /dev/null
+++ b/cluster/staging/site/dathomir.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+ deuxfleurs.siteName = "dathomir";
+ deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
+ deuxfleurs.cnameTarget = "dathomir.site.staging.deuxfleurs.org.";
+}
diff --git a/cluster/staging/site/jupiter.nix b/cluster/staging/site/jupiter.nix
deleted file mode 100644
index 28ba297..0000000
--- a/cluster/staging/site/jupiter.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- deuxfleurs.siteName = "jupiter";
- deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
- deuxfleurs.cnameTarget = "jupiter.site.staging.deuxfleurs.org.";
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:58:58 +0000