From 832075dfb292a3b3dac6e185901ccd47a778e7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Tue, 10 Oct 2023 16:33:28 +0200 Subject: [PATCH] Shorten root domains for external Garage S3 and Web access And move the configuration-specific preceding dot to the config template. --- environments/production.json | 4 ++-- site-cookbooks/kosmos_garage/templates/garage.toml.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/production.json b/environments/production.json index 0324772..954cece 100644 --- a/environments/production.json +++ b/environments/production.json @@ -18,8 +18,8 @@ }, "garage": { "replication_mode": "2", - "s3_api_root_domain": ".s3.garage.kosmos.org", - "s3_web_root_domain": ".web.garage.kosmos.org", + "s3_api_root_domain": "s3.kosmos.org", + "s3_web_root_domain": "web.s3.kosmos.org", "s3_web_domains": [ "s3.kosmos.social", "s3.community.kosmos.org" diff --git a/site-cookbooks/kosmos_garage/templates/garage.toml.erb b/site-cookbooks/kosmos_garage/templates/garage.toml.erb index 0bf6125..657498b 100644 --- a/site-cookbooks/kosmos_garage/templates/garage.toml.erb +++ b/site-cookbooks/kosmos_garage/templates/garage.toml.erb @@ -11,11 +11,11 @@ rpc_secret = "<%= @rpc_secret %>" [s3_api] s3_region = "<%= @s3_region %>" api_bind_addr = "[::]:<%= @s3_api_port %>" -root_domain = "<%= @s3_api_root_domain %>" +root_domain = ".<%= @s3_api_root_domain %>" [s3_web] bind_addr = "[::]:<%= @s3_web_port %>" -root_domain = "<%= @s3_web_root_domain %>" +root_domain = ".<%= @s3_web_root_domain %>" index = "index.html" [k2v_api]