diff options
Diffstat (limited to 'cluster/staging')
4 files changed, 8 insertions, 8 deletions
diff --git a/cluster/staging/app/core/deploy/core-service.hcl b/cluster/staging/app/core/deploy/core-service.hcl index 3f4b343..29491b6 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=ed2653ae7dba9c072dcca1aed03b7cda0d910c85" + "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=b26d4d7bbad7c77f466a00f0bd21e7e4ea09c3b1" ] command = "d53" } @@ -49,7 +49,7 @@ D53_CONSUL_HOST=https://localhost:8501 D53_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt D53_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt D53_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key -D53_PROVIDER=gandi +D53_PROVIDERS=deuxfleurs.org:gandi D53_GANDI_API_KEY={{ key "secrets/d53/gandi_api_key" }} D53_ALLOWED_DOMAINS=staging.deuxfleurs.org RUST_LOG=d53=info diff --git a/cluster/staging/app/core/deploy/core-system.hcl b/cluster/staging/app/core/deploy/core-system.hcl index eb34008..d410573 100644 --- a/cluster/staging/app/core/deploy/core-system.hcl +++ b/cluster/staging/app/core/deploy/core-system.hcl @@ -81,7 +81,7 @@ EOH config { packages = [ - "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=752593e2747f64a8f14de3484ab085ed5f65cd40" + "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=3c5aa3680eab1989361026b96e4968b4cd92dcb5" ] command = "tricot" # cap_add = [ "net_bind_service" ] # this doesn't work for whatever reason, so we need to put user = "root" instead @@ -137,8 +137,8 @@ EOH name = "tricot-http" port = "http_port" tags = [ - "d53-aaaa deuxfleurs.org ${meta.site}.site.staging", - "d53-aaaa deuxfleurs.org staging", + "d53-aaaa ${meta.site}.site.staging.deuxfleurs.org", + "d53-aaaa staging.deuxfleurs.org", # "(diplonat (tcp_port 80))" ] address_mode = "host" diff --git a/cluster/staging/app/directory/deploy/directory.hcl b/cluster/staging/app/directory/deploy/directory.hcl index d25a081..00b8022 100644 --- a/cluster/staging/app/directory/deploy/directory.hcl +++ b/cluster/staging/app/directory/deploy/directory.hcl @@ -112,7 +112,7 @@ EOH tags = [ "guichet", "tricot guichet.staging.deuxfleurs.org", - "d53-cname deuxfleurs.org guichet.staging", + "d53-cname guichet.staging.deuxfleurs.org", ] port = "web_port" check { diff --git a/cluster/staging/app/telemetry/deploy/telemetry.hcl b/cluster/staging/app/telemetry/deploy/telemetry.hcl index 7ee289d..b0dd5a2 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry.hcl @@ -156,7 +156,7 @@ job "telemetry" { tags = [ "grafana", "tricot grafana.staging.deuxfleurs.org", - "d53-cname deuxfleurs.org grafana.staging", + "d53-cname grafana.staging.deuxfleurs.org", ] port = "grafana" check { @@ -240,7 +240,7 @@ EOH name = "jaeger-frontend" tags = [ "tricot jaeger.staging.deuxfleurs.org", - "d53-cname deuxfleurs.org jaeger.staging", + "d53-cname jaeger.staging.deuxfleurs.org", ] check { type = "tcp" |