Changes in prod:
- migrate courgette and concombre to M710q machines with SSD+HDD - migrate prod/c* to nixos 22.11
This commit is contained in:
parent
d56f895a1c
commit
385882c74c
5 changed files with 6 additions and 6 deletions
|
@ -22,7 +22,7 @@ job "cryptpad" {
|
||||||
constraint {
|
constraint {
|
||||||
attribute = "${attr.unique.hostname}"
|
attribute = "${attr.unique.hostname}"
|
||||||
operator = "="
|
operator = "="
|
||||||
value = "courgette"
|
value = "concombre"
|
||||||
}
|
}
|
||||||
|
|
||||||
config {
|
config {
|
||||||
|
@ -30,7 +30,7 @@ job "cryptpad" {
|
||||||
ports = [ "http" ]
|
ports = [ "http" ]
|
||||||
|
|
||||||
volumes = [
|
volumes = [
|
||||||
"/mnt/storage/cryptpad:/mnt",
|
"/mnt/ssd/cryptpad:/mnt",
|
||||||
"secrets/config.js:/etc/cryptpad/config.js",
|
"secrets/config.js:/etc/cryptpad/config.js",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ job "telemetry-storage" {
|
||||||
constraint {
|
constraint {
|
||||||
attribute = "${attr.unique.hostname}"
|
attribute = "${attr.unique.hostname}"
|
||||||
operator = "set_contains_any"
|
operator = "set_contains_any"
|
||||||
value = "concombre,df-ymk"
|
value = "celeri,df-ymk"
|
||||||
}
|
}
|
||||||
|
|
||||||
task "prometheus" {
|
task "prometheus" {
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
networking.hostName = "concombre";
|
networking.hostName = "concombre";
|
||||||
|
|
||||||
deuxfleurs.network_interface = "eno1";
|
deuxfleurs.network_interface = "enp0s31f6";
|
||||||
deuxfleurs.lan_ip = "192.168.1.31";
|
deuxfleurs.lan_ip = "192.168.1.31";
|
||||||
deuxfleurs.ipv6 = "2001:910:1204:1::31";
|
deuxfleurs.ipv6 = "2001:910:1204:1::31";
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
networking.hostName = "courgette";
|
networking.hostName = "courgette";
|
||||||
|
|
||||||
deuxfleurs.network_interface = "eno1";
|
deuxfleurs.network_interface = "enp0s31f6";
|
||||||
deuxfleurs.lan_ip = "192.168.1.32";
|
deuxfleurs.lan_ip = "192.168.1.32";
|
||||||
deuxfleurs.ipv6 = "2001:910:1204:1::32";
|
deuxfleurs.ipv6 = "2001:910:1204:1::32";
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env ./sshtool
|
#!/usr/bin/env ./sshtool
|
||||||
|
|
||||||
if [ "$CLUSTER" = "staging" ]; then
|
if [ "$CLUSTER" = "staging" -o "$NIXHOST" = "concombre" -o "$NIXHOST" = "courgette" -o "$NIXHOST" = "celeri" ]; then
|
||||||
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
|
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
|
||||||
else
|
else
|
||||||
cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
|
cmd nix-channel --add https://nixos.org/channels/nixos-22.05 nixos
|
||||||
|
|
Loading…
Reference in a new issue