1 files changed, 12 insertions, 8 deletions
diff --git a/app/backup/deploy/backup-daily.hcl b/app/backup/deploy/backup-daily.hcl
index ef9b219..f95882f 100644
--- a/app/backup/deploy/backup-daily.hcl
+++ b/app/backup/deploy/backup-daily.hcl
@@ -101,7 +101,7 @@ EOH
   }
 
   group "backup-consul" {
-    task "export-kv-store" {
+    task "consul-kv-export" {
       driver = "docker"
 
       lifecycle {      
@@ -111,11 +111,15 @@ EOH
 
       config {
         image = "consul:1.11.2"
+        network_mode = "host"
         entrypoint = [ "/bin/sh", "-c" ]
-        NETWORK MODE HOST
         args = [ "/bin/consul kv export > $NOMAD_ALLOC_DIR/consul.json" ]
       }
 
+      env {
+        CONSUL_HTTP_ADDR = "http://consul.service.2.cluster.deuxfleurs.fr:8500"
+      }
+
       resources {
         cpu = 200
         memory = 200
@@ -129,22 +133,22 @@ EOH
       }
     }
 
-    task "upload-kv-store" {
+    task "restic-backup" {
       driver = "docker"
 
       config {
         image = "restic/restic:0.12.1"
         entrypoint = [ "/bin/sh", "-c" ]
-        args = [ "restic backup $NOMAD_ALLOC_DIR && restic forget --keep-within 1m1d --keep-within-weekly 3m --keep-within-monthly 1y ; restic prune --max-unused 50% --max-repack-size 2G ; restic check" ]
+        args = [ "restic backup $NOMAD_ALLOC_DIR/consul.json && restic forget --keep-within 1m1d --keep-within-weekly 3m --keep-within-monthly 1y ; restic prune --max-unused 50% --max-repack-size 2G ; restic check" ]
       }
 
 
       template {
         data = <<EOH
-AWS_ACCESS_KEY_ID={{ key "secrets/plume/backup_aws_access_key_id" }}
-AWS_SECRET_ACCESS_KEY={{ key "secrets/plume/backup_aws_secret_access_key" }}
-RESTIC_REPOSITORY={{ key "secrets/plume/backup_restic_repository" }}
-RESTIC_PASSWORD={{ key "secrets/plume/backup_restic_password" }}
+AWS_ACCESS_KEY_ID={{ key "secrets/backup/consul/backup_aws_access_key_id" }}
+AWS_SECRET_ACCESS_KEY={{ key "secrets/backup/consul/backup_aws_secret_access_key" }}
+RESTIC_REPOSITORY={{ key "secrets/backup/consul/backup_restic_repository" }}
+RESTIC_PASSWORD={{ key "secrets/backup/consul/backup_restic_password" }}
 EOH
 
          destination = "secrets/env_vars"