summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/mix/tasks/generate_config.ex8
-rw-r--r--lib/mix/tasks/sample_config.eex2
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex
index bfd18d22e..70a110561 100644
--- a/lib/mix/tasks/generate_config.ex
+++ b/lib/mix/tasks/generate_config.ex
@@ -9,12 +9,6 @@ defmodule Mix.Tasks.GenerateConfig do
name = IO.gets("What is the name of your instance? (e.g. Pleroma/Soykaf): ") |> String.trim()
email = IO.gets("What's your admin email address: ") |> String.trim()
- mediaproxy =
- IO.gets("Do you want to activate the mediaproxy? (y/N): ")
- |> String.trim()
- |> String.downcase()
- |> String.starts_with?("y")
-
secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
@@ -27,8 +21,6 @@ defmodule Mix.Tasks.GenerateConfig do
email: email,
name: name,
secret: secret,
- mediaproxy: mediaproxy,
- proxy_url: proxy_url,
dbpass: dbpass
)
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index 05f11c95d..f563b01d7 100644
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -11,7 +11,7 @@ config :pleroma, :instance,
registrations_open: true
config :pleroma, :media_proxy,
- enabled: <%= mediaproxy %>,
+ enabled: false,
redirect_on_failure: true,
#base_url: "https://cache.pleroma.social"