Merge pull request 'Migration to garage 0.4' (#53) from garage04 into main

Reviewed-on: Deuxfleurs/infrastructure#53
This commit is contained in:
Alex 2021-10-26 16:17:59 +02:00
commit 6c90a00f04
7 changed files with 12 additions and 36 deletions

View file

@ -1,24 +1,18 @@
block_size = 1048576 block_size = 1048576
metadata_dir = "/garage/meta" metadata_dir = "/meta"
data_dir = "/garage/data" data_dir = "/data"
replication_mode = "3" replication_mode = "3"
rpc_bind_addr = "[::]:3901" rpc_bind_addr = "[::]:3901"
rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}"
consul_host = "consul.service.2.cluster.deuxfleurs.fr:8500" consul_host = "consul.service.2.cluster.deuxfleurs.fr:8500"
consul_service_name = "garage-rpc" consul_service_name = "garage-rpc-self-advertised"
bootstrap_peers = [] bootstrap_peers = []
max_concurrent_rpc_requests = 12
[rpc_tls]
ca_cert = "/garage/garage-ca.crt"
node_cert = "/garage/garage.crt"
node_key = "/garage/garage.key"
[s3_api] [s3_api]
s3_region = "garage" s3_region = "garage"
api_bind_addr = "[::]:3900" api_bind_addr = "[::]:3900"

View file

@ -25,15 +25,14 @@ job "garage" {
driver = "docker" driver = "docker"
config { config {
advertise_ipv6_address = true advertise_ipv6_address = true
image = "lxpz/garage_amd64:v0.3.0.2" image = "dxflrs/amd64_garage:v0.4-rc1"
command = "/garage"
args = [ "server" ]
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
"/mnt/storage/garage/data:/garage/data", "/mnt/storage/garage/data:/data",
"/mnt/ssd/garage/meta:/garage/meta", "/mnt/ssd/garage/meta:/meta",
"secrets/garage.toml:/garage/config.toml", "secrets/garage.toml:/etc/garage.toml",
"secrets/garage-ca.crt:/garage/garage-ca.crt",
"secrets/garage.crt:/garage/garage.crt",
"secrets/garage.key:/garage/garage.key",
] ]
logging { logging {
type = "journald" type = "journald"
@ -45,22 +44,8 @@ job "garage" {
destination = "secrets/garage.toml" destination = "secrets/garage.toml"
} }
# --- secrets ---
template {
data = "{{ key \"secrets/garage/garage-ca.crt\" }}"
destination = "secrets/garage-ca.crt"
}
template {
data = "{{ key \"secrets/garage/garage.crt\" }}"
destination = "secrets/garage.crt"
}
template {
data = "{{ key \"secrets/garage/garage.key\" }}"
destination = "secrets/garage.key"
}
resources { resources {
memory = 800 memory = 1500
cpu = 1000 cpu = 1000
} }

View file

@ -1 +0,0 @@
USER_LONG garage-ca.crt (generated with Garage's genkeys.sh script)

View file

@ -1 +0,0 @@
USER_LONG garage-ca.key (generated with Garage's genkeys.sh script)

View file

@ -1 +0,0 @@
USER_LONG garage.crt (generated with Garage's genkeys.sh script)

View file

@ -1 +0,0 @@
USER_LONG garage.key (generated with Garage's genkeys.sh script)

View file

@ -0,0 +1 @@
CMD_ONCE openssl rand -hex 32