aboutsummaryrefslogtreecommitdiff
path: root/cluster
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-11 22:18:52 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-11 22:18:52 +0100
commit8e76707c44def66d981c93a8b68a090cad50ac6c (patch)
treeb67362f1a5cd97e7ee38364bedf40b69a3542db4 /cluster
parent0da378d05327fe6eb30fc00d3d109331fab38866 (diff)
downloadnixcfg-8e76707c44def66d981c93a8b68a090cad50ac6c.tar.gz
nixcfg-8e76707c44def66d981c93a8b68a090cad50ac6c.zip
fix tricot hostname on prod
Diffstat (limited to 'cluster')
-rw-r--r--cluster/prod/app/core/deploy/core-service.hcl2
-rw-r--r--cluster/prod/app/core/deploy/core-system.hcl (renamed from cluster/prod/app/core/deploy/core.hcl)2
-rw-r--r--cluster/staging/app/core/deploy/core-service.hcl2
3 files changed, 3 insertions, 3 deletions
diff --git a/cluster/prod/app/core/deploy/core-service.hcl b/cluster/prod/app/core/deploy/core-service.hcl
index d7a6299..c2fe3c9 100644
--- a/cluster/prod/app/core/deploy/core-service.hcl
+++ b/cluster/prod/app/core/deploy/core-service.hcl
@@ -10,7 +10,7 @@ job "core-service" {
driver = "docker"
config {
- image = "lxpz/amd64_d53:2"
+ image = "lxpz/amd64_d53:3"
network_mode = "host"
readonly_rootfs = true
volumes = [
diff --git a/cluster/prod/app/core/deploy/core.hcl b/cluster/prod/app/core/deploy/core-system.hcl
index b59252e..f430703 100644
--- a/cluster/prod/app/core/deploy/core.hcl
+++ b/cluster/prod/app/core/deploy/core-system.hcl
@@ -121,7 +121,7 @@ EOH
template {
data = <<EOH
-TRICOT_NODE_NAME={{ env "attr.unique.consul.name" }}
+TRICOT_NODE_NAME={{ env "attr.unique.hostname" }}
TRICOT_LETSENCRYPT_EMAIL=prod-sysadmin@deuxfleurs.fr
TRICOT_ENABLE_COMPRESSION=true
TRICOT_CONSUL_HOST=https://consul.service.prod.consul:8501
diff --git a/cluster/staging/app/core/deploy/core-service.hcl b/cluster/staging/app/core/deploy/core-service.hcl
index 5994d89..47d63de 100644
--- a/cluster/staging/app/core/deploy/core-service.hcl
+++ b/cluster/staging/app/core/deploy/core-service.hcl
@@ -11,7 +11,7 @@ job "core-service" {
config {
packages = [
- "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=5731ad022b62564d1364cb1928d261dac04f8914"
+ "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=f7682170805b7953d23745b0414b0f7b6a133225"
]
command = "d53"
}