diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
| commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
| tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/controllers/backups_controller.rb | |
| parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
| parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) | |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/backups_controller.rb')
| -rw-r--r-- | app/controllers/backups_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb index 2f4b400b8..0687b62c5 100644 --- a/app/controllers/backups_controller.rb +++ b/app/controllers/backups_controller.rb @@ -13,7 +13,11 @@ class BackupsController < ApplicationController when :s3 redirect_to @backup.dump.expiring_url(10) when :fog - redirect_to @backup.dump.expiring_url(Time.now.utc + 10) + if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present? + redirect_to @backup.dump.expiring_url(Time.now.utc + 10) + else + redirect_to full_asset_url(@backup.dump.url) + end when :filesystem redirect_to full_asset_url(@backup.dump.url) end |