From b29028405d0732342c37bc7b43a68991dc5e9bac Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Tue, 22 Dec 2020 17:48:27 +0100
Subject: [PATCH] Migrate Garage

---
 app/deployment/garage.hcl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/deployment/garage.hcl b/app/deployment/garage.hcl
index beafb88..d4c7c9e 100644
--- a/app/deployment/garage.hcl
+++ b/app/deployment/garage.hcl
@@ -9,6 +9,11 @@ job "garage" {
   }
 
   group "garage" {
+    network {
+      port "s3" { static = 3900 }
+      port "rpc" { static = 3901 }
+    }
+
     task "server" {
       driver = "docker"
       config {
@@ -16,19 +21,21 @@ job "garage" {
         image = "lxpz/garage_amd64:4"
         network_mode = "host"
         volumes = [
-            "/mnt/storage/garage/data:/garage/data",
-            "/mnt/ssd/garage/meta:/garage/meta",
-			"secrets/garage.toml:/garage/config.toml",
-			"secrets/garage-ca.crt:/garage/garage-ca.crt",
-			"secrets/garage.crt:/garage/garage.crt",
-			"secrets/garage.key:/garage/garage.key",
+          "/mnt/storage/garage/data:/garage/data",
+          "/mnt/ssd/garage/meta:/garage/meta",
+          "secrets/garage.toml:/garage/config.toml",
+          "secrets/garage-ca.crt:/garage/garage-ca.crt",
+          "secrets/garage.crt:/garage/garage.crt",
+          "secrets/garage.key:/garage/garage.key",
         ]
       }
 
       template {
-        data = "{{ key \"configuration/garage/garage.toml\" }}" 
+        data = file("../config/configuration/garage/garage.toml")
         destination = "secrets/garage.toml"
       }
+
+      # --- secrets ---
       template {
         data = "{{ key \"secrets/garage/garage-ca.crt\" }}" 
         destination = "secrets/garage-ca.crt"
@@ -75,7 +82,7 @@ job "garage" {
         tags = ["garage-rpc"]
         port = 3901
         address_mode = "driver"
-	name = "garage-rpc"
+        name = "garage-rpc"
         check {
           type = "tcp"
           port = 3901