tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

staging: remove node cariacou, update garage

Browse source
This commit is contained in:
Alex 2023-01-04 17:06:39 +01:00
parent 3a8588a1ea
commit 9fabb5844a
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
7 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ job "garage-staging" {
config { config {
packages = [ packages = [
"#bash", # so that we can enter a shell inside container "#bash", # so that we can enter a shell inside container
"git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=interrupted-cleanup&rev=0650a43cf14e7e52121a553130a9ea6c92b7bd4a", "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=main&rev=02e8eb167efa1f08d69fe7f8e6192cde726c45aa",
] ]
command = "garage" command = "garage"
args = [ "server" ] args = [ "server" ]

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

@ -14,7 +14,7 @@ job "telemetry-service" {
constraint { constraint {
attribute = "${attr.unique.hostname}" attribute = "${attr.unique.hostname}"
operator = "set_contains_any" operator = "set_contains_any"
value = "cariacou,origan" value = "carcajou,origan"
} }
task "prometheus" { task "prometheus" {

8
cluster/staging/cluster.nix
View file

@ -8,14 +8,6 @@
deuxfleurs.cluster_prefix_length = 16; deuxfleurs.cluster_prefix_length = 16;
deuxfleurs.cluster_nodes = [ deuxfleurs.cluster_nodes = [
{
hostname = "cariacou";
site_name = "neptune";
publicKey = "qxrtfn2zRVnN52Y5NYumyU3/FcRMnh3kJ2C37JfrczA=";
IP = "10.14.1.1";
lan_endpoint = "192.168.1.21:33799";
endpoint = "77.207.15.215:33721";
}
{ {
hostname = "carcajou"; hostname = "carcajou";
site_name = "neptune"; site_name = "neptune";

26
cluster/staging/node/cariacou.nix
View file

@ -1,26 +0,0 @@
# Configuration file local to this node
{ config, pkgs, ... }:
{
imports =
[
./remote-unlock.nix
];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 20;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "cariacou";
deuxfleurs.network_interface = "eno1";
deuxfleurs.lan_ip = "192.168.1.21";
deuxfleurs.ipv6 = "2001:910:1204:1::21";
deuxfleurs.cluster_ip = "10.14.1.1";
deuxfleurs.is_raft_server = true;
system.stateVersion = "21.05";
}

1
cluster/staging/node/cariacou.site.nix
View file

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

2
cluster/staging/node/caribou.nix
View file

@ -15,7 +15,7 @@
deuxfleurs.ipv6 = "2001:910:1204:1::23"; deuxfleurs.ipv6 = "2001:910:1204:1::23";
deuxfleurs.cluster_ip = "10.14.1.3"; deuxfleurs.cluster_ip = "10.14.1.3";
deuxfleurs.is_raft_server = false; deuxfleurs.is_raft_server = true;
system.stateVersion = "21.05"; system.stateVersion = "21.05";
} }

3
cluster/staging/ssh_config
View file

@ -6,9 +6,6 @@ Host caribou
Host carcajou Host carcajou
HostName carcajou.machine.deuxfleurs.fr HostName carcajou.machine.deuxfleurs.fr
Host cariacou
HostName cariacou.machine.deuxfleurs.fr
Host origan Host origan
HostName origan.df.trinity.fr.eu.org HostName origan.df.trinity.fr.eu.org