From da3673386c689b4d63c1b7cbbd9885f8882bf17c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 10 Jun 2020 09:38:06 +0200 Subject: [PATCH] Install fixes Signed-off-by: Thomas Citharel --- lib/mix/tasks/mobilizon/instance.ex | 21 +++++++++------------ priv/templates/config.template.eex | 8 ++++---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/lib/mix/tasks/mobilizon/instance.ex b/lib/mix/tasks/mobilizon/instance.ex index b4d91ced3..bf612b009 100644 --- a/lib/mix/tasks/mobilizon/instance.ex +++ b/lib/mix/tasks/mobilizon/instance.ex @@ -71,7 +71,7 @@ defmodule Mix.Tasks.Mobilizon.Instance do Common.get_option( options, :domain, - "What domain will your instance use? (e.g framameet.org)" + "What domain will your instance use? (e.g mobilizon.org)" ), ":" ) ++ [443] @@ -80,10 +80,16 @@ defmodule Mix.Tasks.Mobilizon.Instance do Common.get_option( options, :name, - "What is the name of your instance? (e.g. Framameet)" + "What is the name of your instance? (e.g. Mobilizon)" ) - email = Common.get_option(options, :admin_email, "What is your admin email address?") + email = + Common.get_option( + options, + :admin_email, + "What's the address email will be send with?", + "noreply@#{domain}" + ) dbhost = Common.get_option(options, :dbhost, "What is the hostname of your database?", "localhost") @@ -121,14 +127,6 @@ defmodule Mix.Tasks.Mobilizon.Instance do 4000 ) - listen_ip = - Common.get_option( - options, - :listen_ip, - "What ip will the app listen to (leave it if you are using the default setup with nginx)?", - "127.0.0.1" - ) - instance_secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) auth_secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) @@ -149,7 +147,6 @@ defmodule Mix.Tasks.Mobilizon.Instance do version: Mobilizon.Mixfile.project() |> Keyword.get(:version), instance_secret: instance_secret, auth_secret: auth_secret, - listen_ip: listen_ip, listen_port: listen_port ) diff --git a/priv/templates/config.template.eex b/priv/templates/config.template.eex index 59c75369c..710c63875 100644 --- a/priv/templates/config.template.eex +++ b/priv/templates/config.template.eex @@ -3,8 +3,8 @@ import Config config :mobilizon, Mobilizon.Web.Endpoint, - url: [host: "<%= instance_domain %>", scheme: "https", port: <%= instance_port %>], - http: [ip: {<%= String.replace(listen_ip, ".", ", ") %>}, port: <%= listen_port %>], + url: [host: "<%= instance_domain %>"], + http: [port: <%= listen_port %>], secret_key_base: "<%= instance_secret %>" config :mobilizon, Mobilizon.Web.Auth.Guardian, @@ -18,8 +18,8 @@ config :mobilizon, :instance, demo: false, allow_relay: true, federating: true, - email_from: "tcit@tcit.fr", - email_reply_to: "tcit@tcit.fr" + email_from: "<%= instance_email %>", + email_reply_to: "<%= instance_email %>" config :mobilizon, Mobilizon.Storage.Repo, adapter: Ecto.Adapters.Postgres,