staging: switch back diplonat & d53 to the docker runner

2 files changed, 22 insertions, 21 deletions

diff --git a/cluster/staging/app/core/deploy/d53.hcl b/cluster/staging/app/core/deploy/d53.hcl
index 42cb819..fd4a74c 100644
--- a/cluster/staging/app/core/deploy/d53.hcl
+++ b/cluster/staging/app/core/deploy/d53.hcl
@@ -7,13 +7,15 @@ job "core-d53" {
     count = 1
 
     task "d53" {
-      driver = "nix2"
+      driver = "docker"
 
       config {
-        packages = [
-          "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=477ac217a09e612f6e72da3d117eac278cca16b4"
+        image = "lxpz/amd64_d53:4"
+        network_mode = "host"
+        readonly_rootfs = true
+        volumes = [
+          "secrets:/etc/d53",
         ]
-        command = "d53"
       }
 
       resources {
@@ -30,25 +32,25 @@ job "core-d53" {
 
       template {
         data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
-        destination = "etc/tricot/consul-ca.crt"
+        destination = "secrets/consul-ca.crt"
       }
 
       template {
         data = "{{ key \"secrets/consul/consul-client.crt\" }}"
-        destination = "etc/tricot/consul-client.crt"
+        destination = "secrets/consul-client.crt"
       }
 
       template {
         data = "{{ key \"secrets/consul/consul-client.key\" }}"
-        destination = "etc/tricot/consul-client.key"
+        destination = "secrets/consul-client.key"
       }
 
       template {
         data = <<EOH
 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_CONSUL_CA_CERT=/etc/d53/consul-ca.crt
+D53_CONSUL_CLIENT_CERT=/etc/d53/consul-client.crt
+D53_CONSUL_CLIENT_KEY=/etc/d53/consul-client.key
 D53_PROVIDERS=deuxfleurs.org:gandi
 D53_GANDI_API_KEY={{ key "secrets/d53/gandi_api_key" }}
 D53_ALLOWED_DOMAINS=staging.deuxfleurs.org
diff --git a/cluster/staging/app/core/deploy/diplonat.hcl b/cluster/staging/app/core/deploy/diplonat.hcl
index b6a83aa..e7657ed 100644
--- a/cluster/staging/app/core/deploy/diplonat.hcl
+++ b/cluster/staging/app/core/deploy/diplonat.hcl
@@ -15,18 +15,17 @@ job "core-diplonat" {
 
   group "diplonat" {
     task "diplonat" {
-      driver = "nix2"
+      driver = "docker"
 
       config {
-        packages = [
-          "#iptables",
-		  "#bash",
-		  "#coreutils",
-          "git+https://git.deuxfleurs.fr/Deuxfleurs/diplonat.git?ref=main&rev=843104dad73bfdebb674d3c3ec82af225c20c493"
+        image = "lxpz/amd64_diplonat:7"
+        network_mode = "host"
+        readonly_rootfs = true
+        privileged = true
+        volumes = [
+          "secrets:/etc/diplonat",
         ]
-        command = "diplonat"
       }
-      user = "root"
 
       restart {
         interval = "30m"
@@ -37,17 +36,17 @@ job "core-diplonat" {
 
       template {
         data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
-        destination = "etc/diplonat/consul-ca.crt"
+        destination = "secrets/consul-ca.crt"
       }
 
       template {
         data = "{{ key \"secrets/consul/consul-client.crt\" }}"
-        destination = "etc/diplonat/consul-client.crt"
+        destination = "secrets/consul-client.crt"
       }
 
       template {
         data = "{{ key \"secrets/consul/consul-client.key\" }}"
-        destination = "etc/diplonat/consul-client.key"
+        destination = "secrets/consul-client.key"
       }
 
       template {