diff options
| author | Mark Felder <feld@feld.me> | 2021-01-12 16:31:35 -0600 | 
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-12 16:31:35 -0600 | 
| commit | 8b28dce82ac244c6c5e67d8379e68e5742bfe875 (patch) | |
| tree | 0c76abd0fb13ecc1a79581cea56d090fe56d2fbf /lib | |
| parent | 5453038ce92597fe2d26cb843d48e9aa660d1ee9 (diff) | |
| download | pleroma-8b28dce82ac244c6c5e67d8379e68e5742bfe875.tar.gz pleroma-8b28dce82ac244c6c5e67d8379e68e5742bfe875.zip | |
Deprecate Pleroma.Uploaders.S3, :public_endpoint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/config/deprecation_warnings.ex | 24 | 
1 files changed, 23 insertions, 1 deletions
| diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex index 59c6b0f58..703a5273f 100644 --- a/lib/pleroma/config/deprecation_warnings.ex +++ b/lib/pleroma/config/deprecation_warnings.ex @@ -40,7 +40,8 @@ defmodule Pleroma.Config.DeprecationWarnings do           :ok <- check_welcome_message_config(),           :ok <- check_gun_pool_options(),           :ok <- check_activity_expiration_config(), -         :ok <- check_remote_ip_plug_name() do +         :ok <- check_remote_ip_plug_name(), +         :ok <- check_uploders_s3_public_endpoint() do        :ok      else        _ -> @@ -193,4 +194,25 @@ defmodule Pleroma.Config.DeprecationWarnings do        warning_preface      )    end + +  @spec check_uploders_s3_public_endpoint() :: :ok | nil +  def check_uploders_s3_public_endpoint do +    s3_config = Pleroma.Config.get([Pleroma.Uploaders.S3]) + +    use_old_config = Keyword.has_key?(s3_config, :public_endpoint) + +    if use_old_config do +      Logger.error(""" +      !!!DEPRECATION WARNING!!! +      Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket.\n +      Please make the following change at your earliest convenience.\n +      \n* `config :pleroma, Pleroma.Uploaders.S3, public_endpoint` is now equal to: +      \n* `config :pleroma, Pleroma.Upload, base_url` +      """) + +      :error +    else +      :ok +    end +  end  end | 
