pleroma

commit: e30a056476d7b13681023cd6490aeea2fd3b4285
parent: e4da81d6629e138d5e1519c081d44a9ed0481ac7
Author: eal <eal@waifu.club>
Date:   Thu, 19 Apr 2018 13:29:14 +0300

Revert "Ask for proxy URL if proxy enabled."

The most common case is running it on the same server.

Diffstat:
M
lib/mix/tasks/generate_config.ex
8
--------
M
lib/mix/tasks/sample_config.eex
2
+-

2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex
@@ -15,14 +15,6 @@ defmodule Mix.Tasks.GenerateConfig do
       |> String.downcase()
       |> String.starts_with?("y")
 
-    proxy_url =
-      if mediaproxy do
-        IO.gets("What is the mediaproxy's URL? (e.g. https://cache.example.com): ")
-        |> String.trim()
-      else
-        "https://cache.example.com"
-      end
-
     secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
     dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
 
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
@@ -13,7 +13,7 @@ config :pleroma, :instance,
 config :pleroma, :media_proxy,
   enabled: <%= mediaproxy %>,
   redirect_on_failure: true,
-  base_url: "<%= proxy_url %>"
+  #base_url: "https://cache.pleroma.social"
 
 # Configure your database
 config :pleroma, Pleroma.Repo,