Merge branch 'master' into feature/default_chatrooms

2023-04-18 17:00:48 +02:00
parent ad90fcd539 7a50bd23d6
commit cb2197893c
44 changed files with 540 additions and 139 deletions
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -111,4 +111,14 @@ class Setting < RailsSettings::Base
  #

  field :nostr_enabled, type: :boolean, default: true
+
+  #
+  # RemoteStorage
+  #
+
+  field :remotestorage_enabled, type: :boolean,
+    default: (ENV["RS_STORAGE_URL"].present?.to_s || false)
+
+  field :rs_storage_url, type: :string,
+    default: ENV["RS_STORAGE_URL"].presence
 end