From 0f0a446ecf69118fc3c710ffe130f8046d5685fb Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Tue, 11 Jul 2023 18:00:08 -0500
Subject: [PATCH] Get garage environment working again

---
 docker/object-storage/docker-compose.yml | 14 +++++++-------
 docker/object-storage/setup-garage.sh    |  1 +
 flake.nix                                |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker/object-storage/docker-compose.yml b/docker/object-storage/docker-compose.yml
index 322a91f7..a4e5d5ab 100644
--- a/docker/object-storage/docker-compose.yml
+++ b/docker/object-storage/docker-compose.yml
@@ -21,13 +21,13 @@ services:
   #      - ./storage/pict-rs:/mnt
   #      - ../../:/opt/app
 
-  pictrs_proxy:
-    image: asonix/pictrs-proxy:0.4.0-rc.2
-    ports:
-      - "8081:8081"
-    environment:
-      - PICTRS_PROXY_UPSTREAM=http://pictrs:8080
-      - PICTRS_PROXY_OPENTELEMETRY_URL=http://otel:4137
+  # pictrs_proxy:
+  #   image: asonix/pictrs-proxy:0.4.0-rc.2
+  #   ports:
+  #     - "8081:8081"
+  #   environment:
+  #     - PICTRS_PROXY_UPSTREAM=http://pictrs:8080
+  #     - PICTRS_PROXY_OPENTELEMETRY_URL=http://otel:4137
 
   minio:
     image: quay.io/minio/minio
diff --git a/docker/object-storage/setup-garage.sh b/docker/object-storage/setup-garage.sh
index 833f536e..43f7bb0d 100755
--- a/docker/object-storage/setup-garage.sh
+++ b/docker/object-storage/setup-garage.sh
@@ -19,6 +19,7 @@ key_id=$(garage -c garage-local.toml key info pict-rs-key 2>>"${STDERR}" | grep
 secret_key=$(garage -c garage-local.toml key info pict-rs-key 2>>"${STDERR}" | grep "Secret key" | awk '{ print $3 }')
 
 garage -c garage-local.toml bucket allow --read --write --owner pict-rs --key pict-rs-key >>"${STDOUT}" 2>>"${STDERR}"
+garage -c garage-local.toml bucket website pict-rs --allow >> "${STDOUT}" 2>>"${STDERR}"
 
 cat > pict-rs-garage.toml <<EOF
 [server]
diff --git a/flake.nix b/flake.nix
index 174468e8..8538a2d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,7 @@
             clippy
             exiftool
             ffmpeg_6-full
+            garage
             gcc
             imagemagick
             protobuf