From 29b7e822fbd5a9001cd31705da5f46672941813c Mon Sep 17 00:00:00 2001 From: Sebastian Huebner Date: Tue, 9 Jan 2018 12:31:11 +0100 Subject: [PATCH 1/2] added question about activating mediaproxy to config generator --- lib/mix/tasks/generate_config.ex | 3 ++- lib/mix/tasks/sample_config.eex | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index f20f93e4d..0dfbda226 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -8,11 +8,12 @@ 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 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, dbpass: dbpass]) + result = EEx.eval_file("lib/mix/tasks/sample_config.eex", [domain: domain, email: email, name: name, secret: secret, mediaproxy: mediaproxy, 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 85a7c554e..05f11c95d 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -10,6 +10,11 @@ config :pleroma, :instance, limit: 5000, registrations_open: true +config :pleroma, :media_proxy, + enabled: <%= mediaproxy %>, + redirect_on_failure: true, + #base_url: "https://cache.pleroma.social" + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, From d56ab43609985801c853b8743f4c33f691f59924 Mon Sep 17 00:00:00 2001 From: eal Date: Fri, 12 Jan 2018 22:38:14 +0200 Subject: [PATCH 2/2] Ask for proxy URL if proxy enabled. Also change the true/false question to y/n --- lib/mix/tasks/generate_config.ex | 12 ++++++++++-- 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,