Make the storage service to use for avatars configurable

diff --git a/app/models/user.rb b/app/models/user.rb
index 8b8f31676b6e37870dfb9542ec8bad4229805b26..023604801cbf49183279acd55449a587e54c1e50 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,7 +87,7 @@ class User < ApplicationRecord
   scope :active, -> { where(:status => %w[active confirmed]) }
   scope :identifiable, -> { where(:data_public => true) }
 
-  has_one_attached :avatar
+  has_one_attached :avatar, :service => Settings.avatar_storage
 
   validates :display_name, :presence => true, :length => 3..255,
                            :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]

diff --git a/config/settings.yml b/config/settings.yml
index 801e8f2d1328045a0629870cd385aaf4afbc526a..929df7b8a15ee5bcc3e829a586927b401d122d8a 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -132,3 +132,5 @@ smtp_enable_starttls_auto: false
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
+# Storage services
+avatar_storage: "local"

diff --git a/config/settings/test.yml b/config/settings/test.yml
index d3952e27bba028b91657916af8b10073103fc0be..77afe95ee3a94b2c7c0bf326c5d51b6af1cee8f7 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -19,3 +19,5 @@ wikipedia_auth_id: "dummy"
 wikipedia_auth_secret: "dummy"
 # Server URL for testing
 server_url: "test.host"
+# Storage services for testing
+avatar_storage: "test"