pleroma

commit: 9194e84d95187d4de067200221c4a4f676af837e
parent: e74f384b685edff5e4fac9da788a7516dd83fe94
Author: lambda <pleromagit@rogerbraun.net>
Date:   Sat, 15 Dec 2018 15:21:40 +0000

Merge branch 'feature/mix-task-instance-port-specification' into 'develop'

Allow port specification in `instance.ex` config generator

See merge request pleroma/pleroma!552
Diffstat:
M
lib/mix/tasks/pleroma/instance.ex
16
++++++++++------
M
lib/mix/tasks/pleroma/sample_config.eex
2
+-

2 files changed, 11 insertions(+), 7 deletions(-)
diff --git 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,
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
@@ -6,7 +6,7 @@
 use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
-   url: [host: "<%= domain %>", scheme: "https", port: 443],
+   url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
    secret_key_base: "<%= secret %>"
 
 config :pleroma, :instance,