From 8b28dce82ac244c6c5e67d8379e68e5742bfe875 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 12 Jan 2021 16:31:35 -0600
Subject: Deprecate Pleroma.Uploaders.S3, :public_endpoint

---
 config/config.exs      | 15 ++++++++++++---
 config/description.exs |  8 +-------
 config/test.exs        |  3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 7b14fbfe5..2a0c6302c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -64,14 +64,23 @@ config :pleroma, Pleroma.Upload,
   link_name: false,
   proxy_remote: false,
   filename_display_max_length: 30,
-  default_description: nil
+  default_description: nil,
+  base_url: nil
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
-  streaming_enabled: true,
-  public_endpoint: "https://s3.amazonaws.com"
+  bucket_namespace: nil,
+  truncated_namespace: false,
+  streaming_enabled: true
+
+config :ex_aws, :s3,
+  # host: "s3.wasabisys.com", # required if not Amazon AWS
+  access_key_id: nil,
+  secret_access_key: nil,
+  # region: nil, # example: "us-east-1"
+  scheme: "https://"
 
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
diff --git a/config/description.exs b/config/description.exs
index f438a88ab..493d362d3 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -149,18 +149,12 @@ config :pleroma, :config_description, [
         description: "S3 bucket namespace",
         suggestions: ["pleroma"]
       },
-      %{
-        key: :public_endpoint,
-        type: :string,
-        description: "S3 endpoint",
-        suggestions: ["https://s3.amazonaws.com"]
-      },
       %{
         key: :truncated_namespace,
         type: :string,
         description:
           "If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <>
-            " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint."
+            " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in Upload base_url."
       },
       %{
         key: :streaming_enabled,
diff --git a/config/test.exs b/config/test.exs
index 7fc457463..e482f38c8 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -117,8 +117,7 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
-  streaming_enabled: true,
-  public_endpoint: nil
+  streaming_enabled: true
 
 config :tzdata, :autoupdate, :disabled
 
-- 
cgit v1.2.3


From f0ab60189e0749ca207b483b291c90f892dce6a3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 13 Jan 2021 11:54:00 -0600
Subject: truncated_namespace should default to nil

---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 2a0c6302c..ef3baed93 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -72,7 +72,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
   bucket_namespace: nil,
-  truncated_namespace: false,
+  truncated_namespace: nil,
   streaming_enabled: true
 
 config :ex_aws, :s3,
-- 
cgit v1.2.3


From 5627f3642fd96b678bdd5c3b9f3da0dbb038d75c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 13 Jan 2021 11:54:45 -0600
Subject: Not needed in test.exs

---
 config/test.exs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index e482f38c8..76c7a2c67 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -115,10 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-config :pleroma, Pleroma.Uploaders.S3,
-  bucket: nil,
-  streaming_enabled: true
-
 config :tzdata, :autoupdate, :disabled
 
 config :pleroma, :mrf, policies: []
-- 
cgit v1.2.3


From 086100e3b7cad827c0f377fdcc4ae9d3b66327c7 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 20 Jan 2021 16:39:39 -0600
Subject: Consistent comment style for :ex_aws

---
 config/config.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index ef3baed93..dc5964fc9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -79,7 +79,7 @@ config :ex_aws, :s3,
   # host: "s3.wasabisys.com", # required if not Amazon AWS
   access_key_id: nil,
   secret_access_key: nil,
-  # region: nil, # example: "us-east-1"
+  # region: "us-east-1", # may be required for Amazon AWS
   scheme: "https://"
 
 config :pleroma, :emoji,
-- 
cgit v1.2.3