Merge pull request #3458 from manyfold3d/s3-path-style

Add option for whether or not to use path-style URLs for non-AWS S3 services

app/helpers/application_helper.rb

@@ -134,7 +134,8 @@ def checkbox_input_row(form, name, options = {})
           content_tag(:div, class: "form-switch") do
             safe_join [
               form.check_box(name, options.merge(class: "form-check-input form-check-inline")),
-              errors_for(form.object, name)
+              errors_for(form.object, name),
+              (options[:help] ? content_tag(:span, class: "form-text") { options[:help] } : nil)
             ].compact
           end
         end

app/models/library.rb

@@ -104,7 +104,7 @@ def storage
         region: s3_region,
         access_key_id: s3_access_key_id,
         secret_access_key: s3_secret_access_key,
-        force_path_style: s3_endpoint.present?,
+        force_path_style: s3_endpoint.present? && s3_path_style,
         use_accelerate_endpoint: s3_endpoint.blank?
       )
     else

app/views/libraries/_form.html.erb

@@ -20,6 +20,7 @@
           <%= text_input_row form, :s3_region, autocomplete: false %>
           <%= text_input_row form, :s3_access_key_id, autocomplete: false %>
           <%= password_input_row form, :s3_secret_access_key, autocomplete: false %>
+          <%= checkbox_input_row form, :s3_path_style, help: t(".s3_path_style.help") %>
         </div>
       </div>
     </div>

config/locales/en.yml

@@ -28,6 +28,7 @@ en:
         s3_access_key_id: Access Key ID
         s3_bucket: Bucket Name
         s3_endpoint: Endpoint URL
+        s3_path_style: Use path-style URLs
         s3_region: Region
         s3_secret_access_key: Secret Access Key
         storage_service: Storage Service

config/locales/libraries/en.yml

@@ -23,6 +23,8 @@ en:
       s3_description_html: Manyfold can use any S3-compatible object storage for your library; this could be from any of a large number of <a href="https://github.com/okhosting/awesome-storage?tab=readme-ov-file#s3-compatible-file-servers">open source</a> or <a href="https://www.storageprovider.info/blog/all-s3-storage-providers/">commercial</a> services.
       s3_endpoint:
         help: Optional; only needed for S3-compatible services, not AWS.
+      s3_path_style:
+        help: Disable to use vhost-style bucket URLs. Only used for S3-compatible services, not AWS.
       tag_regex:
         help: Check for models missing tags matching these regex.
     general:

db/migrate/20250121105010_add_s3_path_style_to_library.rb

@@ -0,0 +1,5 @@
+class AddS3PathStyleToLibrary < ActiveRecord::Migration[7.2]
+  def change
+    add_column :libraries, :s3_path_style, :boolean, default: true, null: false
+  end
+end