diff options
| author | eal <eal@waifu.club> | 2018-01-12 22:38:14 +0200 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-01-12 22:38:14 +0200 |
| commit | d56ab43609985801c853b8743f4c33f691f59924 (patch) | |
| tree | c7eb73702c1fbee1cb27cb35252ef447a07cbb1f /lib | |
| parent | 29b7e822fbd5a9001cd31705da5f46672941813c (diff) | |
| download | pleroma-d56ab43609985801c853b8743f4c33f691f59924.tar.gz | |
Ask for proxy URL if proxy enabled.
Also change the true/false question to y/n
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/generate_config.ex | 12 | ||||
| -rw-r--r-- | lib/mix/tasks/sample_config.eex | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index 0dfbda226..2d962124f 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -8,12 +8,20 @@ defmodule Mix.Tasks.GenerateConfig do domain = IO.gets("What is your domain name? (e.g. pleroma.soykaf.com): ") |> String.trim 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? (true/false): ") |> String.trim + mediaproxy = IO.gets("Do you want to activate the mediaproxy? (y/N): ") + |> String.trim() + |> 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) resultSql = EEx.eval_file("lib/mix/tasks/sample_psql.eex", [dbpass: dbpass]) - result = EEx.eval_file("lib/mix/tasks/sample_config.eex", [domain: domain, email: email, name: name, secret: secret, mediaproxy: mediaproxy, dbpass: dbpass]) + result = EEx.eval_file("lib/mix/tasks/sample_config.eex", [domain: domain, email: email, name: name, secret: secret, mediaproxy: mediaproxy, proxy_url: proxy_url, dbpass: dbpass]) IO.puts("\nWriting config to config/generated_config.exs.\n\nCheck it and configure your database, then copy it to either config/dev.secret.exs or config/prod.secret.exs") File.write("config/generated_config.exs", result) diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 05f11c95d..9330fae2d 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: "https://cache.pleroma.social" + base_url: "<%= proxy_url %>" # Configure your database config :pleroma, Pleroma.Repo, |