squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow port specification in instance.ex

Browse Source
This commit is contained in:
Rin Toshaka 2018-12-15 11:00:54 +01:00
parent e74f384b68
commit 4a895a46d1
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mix/tasks/pleroma/instance.ex
View File

@ -58,12 +58,15 @@ defmodule Mix.Tasks.Pleroma.Instance do
proceed? = Enum.empty?(will_overwrite) or Keyword.get(options, :force, false) proceed? = Enum.empty?(will_overwrite) or Keyword.get(options, :force, false)
unless not proceed? do unless not proceed? do
domain = [domain, port | _] =
String.split(
Common.get_option( Common.get_option(
options, options,
:domain, :domain,
"What domain will your instance use? (e.g pleroma.soykaf.com)" "What domain will your instance use? (e.g pleroma.soykaf.com)"
) ),
":"
) ++ [443]
name = name =
Common.get_option( Common.get_option(
@ -104,6 +107,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
EEx.eval_file( EEx.eval_file(
"sample_config.eex" |> Path.expand(__DIR__), "sample_config.eex" |> Path.expand(__DIR__),
domain: domain, domain: domain,
port: port,
email: email, email: email,
name: name, name: name,
dbhost: dbhost, dbhost: dbhost,

2
lib/mix/tasks/pleroma/sample_config.eex
View File

@ -6,7 +6,7 @@
use Mix.Config use Mix.Config
config :pleroma, Pleroma.Web.Endpoint, config :pleroma, Pleroma.Web.Endpoint,
url: [host: "<%= domain %>", scheme: "https", port: 443], url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
secret_key_base: "<%= secret %>" secret_key_base: "<%= secret %>"
config :pleroma, :instance, config :pleroma, :instance,