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

staging: update D53 tags to new (simpler) syntax

Browse source
This commit is contained in:
Alex 2022-12-11 21:27:16 +01:00
parent a1fc396412
commit 36e6756b3c
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cluster/staging/app/core/deploy/core-service.hcl
View file

@ -11,7 +11,7 @@ job "core-service" {
config { config {
packages = [ 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" command = "d53"
} }
@ -49,7 +49,7 @@ D53_CONSUL_HOST=https://localhost:8501
D53_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt D53_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt
D53_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt D53_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt
D53_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key 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_GANDI_API_KEY={{ key "secrets/d53/gandi_api_key" }}
D53_ALLOWED_DOMAINS=staging.deuxfleurs.org D53_ALLOWED_DOMAINS=staging.deuxfleurs.org
RUST_LOG=d53=info RUST_LOG=d53=info

6
cluster/staging/app/core/deploy/core-system.hcl
View file

@ -81,7 +81,7 @@ EOH
config { config {
packages = [ 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" command = "tricot"
# cap_add = [ "net_bind_service" ] # this doesn't work for whatever reason, so we need to put user = "root" instead # 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" name = "tricot-http"
port = "http_port" port = "http_port"
tags = [ tags = [
"d53-aaaa deuxfleurs.org ${meta.site}.site.staging", "d53-aaaa ${meta.site}.site.staging.deuxfleurs.org",
"d53-aaaa deuxfleurs.org staging", "d53-aaaa staging.deuxfleurs.org",
# "(diplonat (tcp_port 80))" # "(diplonat (tcp_port 80))"
] ]
address_mode = "host" address_mode = "host"

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

@ -112,7 +112,7 @@ EOH
tags = [ tags = [
"guichet", "guichet",
"tricot guichet.staging.deuxfleurs.org", "tricot guichet.staging.deuxfleurs.org",
"d53-cname deuxfleurs.org guichet.staging", "d53-cname guichet.staging.deuxfleurs.org",
] ]
port = "web_port" port = "web_port"
check { check {

4
cluster/staging/app/telemetry/deploy/telemetry.hcl
View file

@ -156,7 +156,7 @@ job "telemetry" {
tags = [ tags = [
"grafana", "grafana",
"tricot grafana.staging.deuxfleurs.org", "tricot grafana.staging.deuxfleurs.org",
"d53-cname deuxfleurs.org grafana.staging", "d53-cname grafana.staging.deuxfleurs.org",
] ]
port = "grafana" port = "grafana"
check { check {
@ -240,7 +240,7 @@ EOH
name = "jaeger-frontend" name = "jaeger-frontend"
tags = [ tags = [
"tricot jaeger.staging.deuxfleurs.org", "tricot jaeger.staging.deuxfleurs.org",
"d53-cname deuxfleurs.org jaeger.staging", "d53-cname jaeger.staging.deuxfleurs.org",
] ]
check { check {
type = "tcp" type = "tcp"