From d0ba9ca90b2c5447e018145c3427f221ebfd24fe Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 30 Jan 2025 12:35:19 -0500 Subject: [PATCH] make garage better Signed-off-by: cy --- hosts/chunk/default.nix | 2 -- hosts/chunk/garage.nix | 27 +++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 577e9b5..e149526 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, ... }: diff --git a/hosts/chunk/garage.nix b/hosts/chunk/garage.nix index 75730a1..a6f39dd 100644 --- a/hosts/chunk/garage.nix +++ b/hosts/chunk/garage.nix @@ -8,6 +8,12 @@ s3_api = { s3_region = "earth"; api_bind_addr = "[::]:3900"; + root_domain = ".s3.cy7.sh"; + }; + s3_web = { + bind_addr = "[::]:3902"; + root_domain = ".web.s3.cy7.sh"; + index = "index.html"; }; admin.api_bind_addr = "[::]:3903"; rpc_bind_addr = "[::]:3901"; @@ -17,8 +23,21 @@ environmentFile = config.sops.secrets."garage/env".path; }; - services.caddy.virtualHosts."s3.cy7.sh".extraConfig = '' - import common - reverse_proxy localhost:3900 - ''; + services.caddy.virtualHosts = { + "s3.cy7.sh" = { + serverAliases = [ "*.s3.cy7.sh" ]; + extraConfig = '' + import common + reverse_proxy localhost:3900 + ''; + }; + "*.web.s3.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3902 + ''; + "admin.s3.cy7.sh".extraConfig = '' + import common + reverse_proxy localhost:3903 + ''; + }; }