From 8e76707c44def66d981c93a8b68a090cad50ac6c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 11 Jan 2023 22:18:52 +0100
Subject: [PATCH] fix tricot hostname on prod

---
 cluster/prod/app/core/deploy/core-service.hcl              | 2 +-
 cluster/prod/app/core/deploy/{core.hcl => core-system.hcl} | 2 +-
 cluster/staging/app/core/deploy/core-service.hcl           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename cluster/prod/app/core/deploy/{core.hcl => core-system.hcl} (99%)

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
similarity index 99%
rename from cluster/prod/app/core/deploy/core.hcl
rename to 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"
       }