Allow customization of ActiveStorage storage

.github/workflows/ci.yml

@@ -64,6 +64,7 @@ jobs:
         run: |
           cp config/action_mailer.yml.ci config/action_mailer.yml
           cp config/content_security_policy.yml.ci config/content_security_policy.yml
+          cp config/storage.yml.ci config/storage.yml
           cp config/database.yml.ci config/database.yml
           cp config/mnemosyne.yml.ci config/mnemosyne.yml
 

.gitignore

@@ -43,6 +43,7 @@
 /config/mnemosyne.yml
 /config/settings.local.yml
 /config/settings/*.local.yml
+/config/storage.yml
 /config/environments/*.local.yml
 
 # Ignore temporary files

Gemfile

@@ -3,6 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'acts-as-taggable-on'
+gem 'aws-sdk-s3', require: false
 gem 'bcrypt'
 gem 'bootsnap', require: false
 gem 'bootstrap-will_paginate'

Gemfile.lock

@@ -83,6 +83,25 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     amq-protocol (2.3.4)
     ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1147.0)
+    aws-sdk-core (3.229.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.110.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.196.1)
+      aws-sdk-core (~> 3, >= 3.228.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
     bcrypt (3.1.20)
     benchmark (0.4.1)
@@ -222,6 +241,7 @@ GEM
     jbuilder (2.14.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
+    jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -647,7 +667,6 @@ PLATFORMS
   arm-linux-gnu
   arm-linux-musl
   arm64-darwin
-  ruby
   x86-linux-gnu
   x86-linux-musl
   x86_64-darwin
@@ -656,6 +675,7 @@ PLATFORMS
 
 DEPENDENCIES
   acts-as-taggable-on
+  aws-sdk-s3
   bcrypt
   better_errors
   binding_of_caller
@@ -754,6 +774,12 @@ CHECKSUMS
   addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232
   amq-protocol (2.3.4) sha256=98be5b9244e28dc66acc8351a254dbf45d996c5a0b7d49ab3ff8b72b0d2e6308
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  aws-eventstream (1.4.0)
+  aws-partitions (1.1147.0)
+  aws-sdk-core (3.229.0)
+  aws-sdk-kms (1.110.0)
+  aws-sdk-s3 (1.196.1)
+  aws-sigv4 (1.12.1)
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bcrypt (3.1.20) sha256=8410f8c7b3ed54a3c00cd2456bf13917d695117f033218e2483b2e40b0784099
   benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
@@ -825,6 +851,7 @@ CHECKSUMS
   irb (1.15.2) sha256=222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba
   iso-639 (0.3.8) sha256=48b8104a4b55367fda347609e36ef8eeb3a0b4d048b36365371c274958be7535
   jbuilder (2.14.1) sha256=4eb26376ff60ef100cb4fd6fd7533cd271f9998327e86adf20fd8c0e69fabb42
+  jmespath (1.6.2)
   jquery-rails (4.6.0) sha256=3c4e6bf47274340b44d836b8aa1b5472c6d451e2739af5ec094421f39025a7e2
   js-routes (2.3.5) sha256=8279fd3be49916309dfeaee546d659b97986e3edbb47332902e688992b143a4d
   json (2.13.2) sha256=02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68

config/environments/production.rb

@@ -49,8 +49,8 @@
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
   # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
-  # Store uploaded files on the local file system (see config/storage.yml for options).
-  config.active_storage.service = :local
+  # Store uploaded files on the local file system by default (see config/storage.yml for options).
+  config.active_storage.service = ENV.fetch('ACTIVE_STORAGE_SERVICE', :local)
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil

config/storage.yml.ci

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>

config/storage.yml.example

@@ -0,0 +1,15 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Local storage is used by default. To use another storage provider in production,
+# please set ACTIVE_STORAGE_SERVICE=aws and the corresponding configuration.
+# The aws-sdk-s3 GEM is included to support S3-compatible providers. 
+# 
+# aws:
+#   service: S3
+#   ...