Revert "Ask for proxy URL if proxy enabled."

The most common case is running it on the same server.
This commit is contained in:
eal 2018-04-19 13:29:14 +03:00
parent e4da81d662
commit e30a056476
2 changed files with 1 additions and 9 deletions

View File

@ -15,14 +15,6 @@ defmodule Mix.Tasks.GenerateConfig do
|> String.downcase() |> String.downcase()
|> String.starts_with?("y") |> 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) secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)

View File

@ -13,7 +13,7 @@ config :pleroma, :instance,
config :pleroma, :media_proxy, config :pleroma, :media_proxy,
enabled: <%= mediaproxy %>, enabled: <%= mediaproxy %>,
redirect_on_failure: true, redirect_on_failure: true,
base_url: "<%= proxy_url %>" #base_url: "https://cache.pleroma.social"
# Configure your database # Configure your database
config :pleroma, Pleroma.Repo, config :pleroma, Pleroma.Repo,