aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-02-01 15:33:33 +0100
committerAlex Auvolat <alex@adnab.me>2022-02-01 15:33:33 +0100
commitf74651a0c3a490bdf93a3807b1de65f1cef4649f (patch)
tree5577af9b64edbeb9736dba51fe1a909d6b0e4b35
parent5ecab67379d5112f4699db5a39ae27d6da815228 (diff)
downloadinfrastructure-f74651a0c3a490bdf93a3807b1de65f1cef4649f.tar.gz
infrastructure-f74651a0c3a490bdf93a3807b1de65f1cef4649f.zip
Upgrade garage to 0.6 RC1
-rw-r--r--app/garage/config/garage.toml7
-rw-r--r--app/garage/deploy/garage.hcl6
2 files changed, 3 insertions, 10 deletions
diff --git a/app/garage/config/garage.toml b/app/garage/config/garage.toml
index e637cfb..177792e 100644
--- a/app/garage/config/garage.toml
+++ b/app/garage/config/garage.toml
@@ -8,16 +8,11 @@ replication_mode = "3"
rpc_bind_addr = "[::]:3901"
rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}"
-consul_host = "consul.service.2.cluster.deuxfleurs.fr:8500"
-consul_service_name = "garage-rpc-self-advertised"
-
-bootstrap_peers = []
-
[s3_api]
s3_region = "garage"
api_bind_addr = "[::]:3900"
+root_domain = ".garage.deuxfleurs.fr"
[s3_web]
bind_addr = "[::]:3902"
root_domain = ".web.deuxfleurs.fr"
-index = "index.html"
diff --git a/app/garage/deploy/garage.hcl b/app/garage/deploy/garage.hcl
index adb9454..ea40c04 100644
--- a/app/garage/deploy/garage.hcl
+++ b/app/garage/deploy/garage.hcl
@@ -25,7 +25,7 @@ job "garage" {
driver = "docker"
config {
advertise_ipv6_address = true
- image = "dxflrs/amd64_garage:v0.5.0"
+ image = "dxflrs/amd64_garage:v0.6.0-rc1"
command = "/garage"
args = [ "server" ]
network_mode = "host"
@@ -55,10 +55,8 @@ job "garage" {
service {
tags = [
"garage_api",
- "traefik.enable=true",
- "traefik.frontend.entryPoints=https,http",
- "traefik.frontend.rule=Host:garage.deuxfleurs.fr",
"tricot garage.deuxfleurs.fr",
+ "tricot *.garage.deuxfleurs.fr",
]
port = 3900
address_mode = "driver"