diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/benchmark.exs | 8 | ||||
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 19 |
3 files changed, 8 insertions, 23 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index dd99cf5fd..84c6782a2 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -82,3 +82,11 @@ config :pleroma, :database, rum_enabled: rum_enabled IO.puts("RUM enabled: #{rum_enabled}") config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock + +if File.exists?("./config/benchmark.secret.exs") do + import_config "benchmark.secret.exs" +else + IO.puts( + "You may want to create benchmark.secret.exs to declare custom database connection parameters." + ) +end diff --git a/config/config.exs b/config/config.exs index df677c2e0..0a8f1465c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -108,10 +108,6 @@ config :pleroma, Pleroma.Uploaders.S3, streaming_enabled: true, public_endpoint: "https://s3.amazonaws.com" -config :pleroma, Pleroma.Uploaders.MDII, - cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi", - files: "https://mdii.sakura.ne.jp" - config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], diff --git a/config/description.exs b/config/description.exs index 3c5febf05..5de9392d2 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2774,25 +2774,6 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: Pleroma.Uploaders.MDII, - description: - "Uploader for https://github.com/hakaba-hitoyo/minimal-digital-image-infrastructure", - type: :group, - children: [ - %{ - key: :cgi, - type: :string, - suggestions: ["https://mdii.sakura.ne.jp/mdii-post.cgi"] - }, - %{ - key: :files, - type: :string, - suggestions: ["https://mdii.sakura.ne.jp"] - } - ] - }, - %{ - group: :pleroma, key: :http, type: :group, description: "HTTP settings", |