Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

Merge pull request 'dathomir: Updates' (#29) from KokaKiwi/nixcfg:dathomir-update into main

Browse source 
Reviewed-on: #29
Reviewed-by: maximilien <me@mricher.fr>
This commit is contained in:
Jill 2024-07-02 09:41:08 +00:00
commit 98feb96d27
18 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cluster/prod/cluster.nix
View file

@ -93,6 +93,12 @@
address = "10.83.5.3"; address = "10.83.5.3";
endpoint = "82.64.238.84:33742"; 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 # Pin Nomad version

1
cluster/prod/known_hosts
View file

@ -12,3 +12,4 @@ ananas.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHs0zAyBy70oyV5
onion.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjBQ67fxwuDDzRPveTko/Sgf0cev3tIvlr3CfAmhF0C onion.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjBQ67fxwuDDzRPveTko/Sgf0cev3tIvlr3CfAmhF0C
oseille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAgQdQ5UVFFn+DXN90ut9+V7NtEopQJnES3r8soKTZW4 oseille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAgQdQ5UVFFn+DXN90ut9+V7NtEopQJnES3r8soKTZW4
io.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIvgCJ7Jew7ou1RZuaT41Sd+ucZAgxUwtdieqNqoC3+T io.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIvgCJ7Jew7ou1RZuaT41Sd+ucZAgxUwtdieqNqoC3+T
ortie.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqtfIPLk8a5tM6Upj7GQwlIS16nBPrZYVXE2FVlO2Yn

12
cluster/prod/node/ortie.nix Normal file
View file

@ -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";
}

1
cluster/prod/node/ortie.site.nix Symbolic link
View file

@ -0,0 +1 @@
../site/dathomir.nix

3
cluster/prod/ssh_config
View file

@ -41,3 +41,6 @@ Host oseille
Host io Host io
HostName io.machine.deuxfleurs.fr HostName io.machine.deuxfleurs.fr
Host ortie
HostName ortie.machine.deuxfleurs.fr

2
cluster/staging/app/ci/deploy/albatros.hcl
View file

@ -1,5 +1,5 @@
job "albatros" { job "albatros" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service" type = "service"
priority = 90 priority = 90

2
cluster/staging/app/ci/deploy/builder.hcl
View file

@ -2,7 +2,7 @@ job "builder" {
namespace = "ci" namespace = "ci"
type = "batch" type = "batch"
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
priority = 100 priority = 100
parameterized { parameterized {

2
cluster/staging/app/core/deploy/d53.hcl
View file

@ -1,5 +1,5 @@
job "core-d53" { job "core-d53" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service" type = "service"
priority = 90 priority = 90

2
cluster/staging/app/core/deploy/diplonat.hcl
View file

@ -1,5 +1,5 @@
job "core-diplonat" { job "core-diplonat" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system" type = "system"
priority = 90 priority = 90

2
cluster/staging/app/core/deploy/tricot.hcl
View file

@ -1,5 +1,5 @@
job "core-tricot" { job "core-tricot" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system" type = "system"
priority = 90 priority = 90

2
cluster/staging/app/garage/deploy/garage.hcl
View file

@ -1,5 +1,5 @@
job "garage-staging" { job "garage-staging" {
datacenters = [ "neptune", "jupiter", "corrin", "bespin" ] datacenters = [ "neptune", "dathomir", "corrin", "bespin" ]
type = "system" type = "system"
priority = 90 priority = 90

2
cluster/staging/app/telemetry/deploy/telemetry-service.hcl
View file

@ -1,5 +1,5 @@
job "telemetry-service" { job "telemetry-service" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "service" type = "service"
group "prometheus" { group "prometheus" {

2
cluster/staging/app/telemetry/deploy/telemetry-system.hcl
View file

@ -1,5 +1,5 @@
job "telemetry-system" { job "telemetry-system" {
datacenters = ["neptune", "jupiter", "corrin", "bespin"] datacenters = ["neptune", "dathomir", "corrin", "bespin"]
type = "system" type = "system"
priority = "100" priority = "100"

2
cluster/staging/cluster.nix
View file

@ -14,7 +14,7 @@
endpoint = "77.207.15.215:33723"; endpoint = "77.207.15.215:33723";
}; };
"origan" = { "origan" = {
siteName = "jupiter"; siteName = "dathomir";
publicKey = "smBQYUS60JDkNoqkTT7TgbpqFiM43005fcrT6472llI="; publicKey = "smBQYUS60JDkNoqkTT7TgbpqFiM43005fcrT6472llI=";
address = "10.14.2.33"; address = "10.14.2.33";
endpoint = "82.64.238.84:33733"; endpoint = "82.64.238.84:33733";

5
cluster/staging/node/origan.nix
View file

@ -1,7 +1,4 @@
# Configuration file local to this node { ... }:
{ config, pkgs, ... }:
{ {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

2
cluster/staging/node/origan.site.nix
View file

@ -1 +1 @@
../site/jupiter.nix ../site/dathomir.nix

6
cluster/staging/site/dathomir.nix Normal file
View file

@ -0,0 +1,6 @@
{ ... }:
{
deuxfleurs.siteName = "dathomir";
deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
deuxfleurs.cnameTarget = "dathomir.site.staging.deuxfleurs.org.";
}

7
cluster/staging/site/jupiter.nix
View file

@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
deuxfleurs.siteName = "jupiter";
deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1";
deuxfleurs.cnameTarget = "jupiter.site.staging.deuxfleurs.org.";
}