From 6d7fbd2175ea441835ef08b1b7baec7c47803837 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 1 Jun 2025 12:42:51 -0400 Subject: [PATCH] Clean up the purestorage config, and add explanatory comments. We're keeping beta on local disk for now. --- config/environments/beta.rb | 2 +- config/storage.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/environments/beta.rb b/config/environments/beta.rb index a037b4159..c7f44040b 100644 --- a/config/environments/beta.rb +++ b/config/environments/beta.rb @@ -3,6 +3,6 @@ require_relative "production" Rails.application.configure do config.action_mailer.default_url_options = { host: "%{tenant}.37signals.works" } - # I couldn't figure out how to configure Pure to allow updates from Kevin's digital ocean instance. + # Let's keep beta on local disk. See https://github.com/basecamp/fizzy/pull/557 for context. config.active_storage.service = :local end diff --git a/config/storage.yml b/config/storage.yml index 1a6bf5c76..38ac38be7 100644 --- a/config/storage.yml +++ b/config/storage.yml @@ -6,10 +6,11 @@ local: service: Disk root: <%= Rails.root.join("storage", "tenants", Rails.env, "%{tenant}", "files") %> -<% purestorage_env_name = Rails.env.beta? ? "staging" : Rails.env %> +# We have "development", "staging", and "production" buckets configured. Note that we don't have a +# "beta" bucket. (As of 2025-06-01.) purestorage: service: S3 - bucket: fizzy-<%= purestorage_env_name %>-activestorage + bucket: fizzy-<%= Rails.env %>-activestorage endpoint: "https://storage.basecamp.com" ssl_verify_peer: false # FIXME: using self-signed cert internally force_path_style: true