From e30a056476d7b13681023cd6490aeea2fd3b4285 Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 19 Apr 2018 13:29:14 +0300 Subject: Revert "Ask for proxy URL if proxy enabled." The most common case is running it on the same server. --- lib/mix/tasks/generate_config.ex | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/mix/tasks/generate_config.ex') 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) -- cgit v1.2.3 From 77fc40d5d737864e1530b212fb3f3453e6122dbc Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 19 Apr 2018 12:50:25 +0200 Subject: Fix generate config --- lib/mix/tasks/generate_config.ex | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/mix/tasks/generate_config.ex') 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 ) -- cgit v1.2.3