Browse Source

Fixes #4918 - Automatic Simple Storage Configuration

Martin Gruner 1 year ago
parent
commit
3d77f9698b
2 changed files with 5 additions and 1 deletions
  1. 2 1
      db/seeds.rb
  2. 3 0
      spec/support/vcr.rb

+ 2 - 1
db/seeds.rb

@@ -29,9 +29,10 @@ seeds.each do |seed|
   load Rails.root.join('db', 'seeds', "#{seed}.rb")
 end
 
-# set basic Rails server settings via environment variables
+# set basic settings via environment variables
 Setting.set('http_type', ENV['ZAMMAD_HTTP_TYPE']) if ENV['ZAMMAD_HTTP_TYPE']
 Setting.set('fqdn',      ENV['ZAMMAD_FQDN'])      if ENV['ZAMMAD_FQDN']
+Setting.set('storage_provider', 'S3')             if ENV['S3_URL']
 
 # reset primary key sequences
 DbHelper.import_post

+ 3 - 0
spec/support/vcr.rb

@@ -118,6 +118,9 @@ RSpec.configure do |config|
         travel_to(cassette.http_interactions.interactions.first.recorded_at)
       end
 
+      # S3 does not play well with time freezing (Aws::S3::Errors::RequestTimeTooSkewed).
+      Setting.set('storage_provider', 'DB') if Setting.get('storage_provider') == 'S3'
+
       example.run
     end
   end