diff options
| author | raeno <just.raeno@gmail.com> | 2018-12-18 14:59:32 +0100 |
|---|---|---|
| committer | raeno <just.raeno@gmail.com> | 2018-12-18 14:59:32 +0100 |
| commit | a3003364598b42849e384a216948dad810481f51 (patch) | |
| tree | 2ed2b04efab457220a60fb7630906b1b26f24df3 /lib/mix/tasks/pleroma/instance.ex | |
| parent | 30812f84518f1b2fcc70a416d1a6b9f81264f3a5 (diff) | |
| parent | b6ae412fcd7c67d64dd1467e8e35d17140e992df (diff) | |
| download | pleroma-a3003364598b42849e384a216948dad810481f51.tar.gz | |
Merge branch 'develop' into oembed_provider
Diffstat (limited to 'lib/mix/tasks/pleroma/instance.ex')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 3be856115..02e1ce27d 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -58,12 +58,15 @@ defmodule Mix.Tasks.Pleroma.Instance do proceed? = Enum.empty?(will_overwrite) or Keyword.get(options, :force, false) unless not proceed? do - domain = - Common.get_option( - options, - :domain, - "What domain will your instance use? (e.g pleroma.soykaf.com)" - ) + [domain, port | _] = + String.split( + Common.get_option( + options, + :domain, + "What domain will your instance use? (e.g pleroma.soykaf.com)" + ), + ":" + ) ++ [443] name = Common.get_option( @@ -104,6 +107,7 @@ defmodule Mix.Tasks.Pleroma.Instance do EEx.eval_file( "sample_config.eex" |> Path.expand(__DIR__), domain: domain, + port: port, email: email, name: name, dbhost: dbhost, |