Deuxfleurs/nixcfg
14
7
Fork 2
Code Issues 16 Pull requests 2 Projects Releases Wiki Activity

staging: switch back diplonat & d53 to the docker runner

Browse source
This commit is contained in:
Armaël Guéneau 2025-02-15 17:33:25 +01:00
parent 5ad325ebed
commit 2f7b846fb0
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cluster/staging/app/core/deploy/d53.hcl
View file

@ -7,13 +7,15 @@ job "core-d53" {
count = 1 count = 1
task "d53" { task "d53" {
driver = "nix2" driver = "docker"
config { config {
packages = [ image = "lxpz/amd64_d53:4"
"git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=477ac217a09e612f6e72da3d117eac278cca16b4" network_mode = "host"
readonly_rootfs = true
volumes = [
"secrets:/etc/d53",
] ]
command = "d53"
} }
resources { resources {
@ -30,25 +32,25 @@ job "core-d53" {
template { template {
data = "{{ key \"secrets/consul/consul-ca.crt\" }}" data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
destination = "etc/tricot/consul-ca.crt" destination = "secrets/consul-ca.crt"
} }
template { template {
data = "{{ key \"secrets/consul/consul-client.crt\" }}" data = "{{ key \"secrets/consul/consul-client.crt\" }}"
destination = "etc/tricot/consul-client.crt" destination = "secrets/consul-client.crt"
} }
template { template {
data = "{{ key \"secrets/consul/consul-client.key\" }}" data = "{{ key \"secrets/consul/consul-client.key\" }}"
destination = "etc/tricot/consul-client.key" destination = "secrets/consul-client.key"
} }
template { template {
data = <<EOH data = <<EOH
D53_CONSUL_HOST=https://localhost:8501 D53_CONSUL_HOST=https://localhost:8501
D53_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt D53_CONSUL_CA_CERT=/etc/d53/consul-ca.crt
D53_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt D53_CONSUL_CLIENT_CERT=/etc/d53/consul-client.crt
D53_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key D53_CONSUL_CLIENT_KEY=/etc/d53/consul-client.key
D53_PROVIDERS=deuxfleurs.org: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

21
cluster/staging/app/core/deploy/diplonat.hcl
View file

@ -15,18 +15,17 @@ job "core-diplonat" {
group "diplonat" { group "diplonat" {
task "diplonat" { task "diplonat" {
driver = "nix2" driver = "docker"
config { config {
packages = [ image = "lxpz/amd64_diplonat:7"
"#iptables", network_mode = "host"
"#bash", readonly_rootfs = true
"#coreutils", privileged = true
"git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=main&rev=843104dad73bfdebb674d3c3ec82af225c20c493" volumes = [
"secrets:/etc/diplonat",
] ]
command = "diplonat"
} }
user = "root"
restart { restart {
interval = "30m" interval = "30m"
@ -37,17 +36,17 @@ job "core-diplonat" {
template { template {
data = "{{ key \"secrets/consul/consul-ca.crt\" }}" data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
destination = "etc/diplonat/consul-ca.crt" destination = "secrets/consul-ca.crt"
} }
template { template {
data = "{{ key \"secrets/consul/consul-client.crt\" }}" data = "{{ key \"secrets/consul/consul-client.crt\" }}"
destination = "etc/diplonat/consul-client.crt" destination = "secrets/consul-client.crt"
} }
template { template {
data = "{{ key \"secrets/consul/consul-client.key\" }}" data = "{{ key \"secrets/consul/consul-client.key\" }}"
destination = "etc/diplonat/consul-client.key" destination = "secrets/consul-client.key"
} }
template { template {