diff options
| author | eal <eal@waifu.club> | 2018-04-19 13:29:14 +0300 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-04-19 13:29:14 +0300 |
| commit | e30a056476d7b13681023cd6490aeea2fd3b4285 (patch) | |
| tree | fc30a51970cce2d59e730f63f5fae1bee79a65cc | |
| parent | e4da81d6629e138d5e1519c081d44a9ed0481ac7 (diff) | |
| download | pleroma-e30a056476d7b13681023cd6490aeea2fd3b4285.tar.gz pleroma-e30a056476d7b13681023cd6490aeea2fd3b4285.zip | |
Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
| -rw-r--r-- | lib/mix/tasks/generate_config.ex | 8 | ||||
| -rw-r--r-- | lib/mix/tasks/sample_config.eex | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index ae9ac3b75..bfd18d22e 100644 --- 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 index 9330fae2d..05f11c95d 100644 --- 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, |