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

Allow port specification in `instance.ex` config generator

See merge request pleroma/pleroma!552

lib/mix/tasks/pleroma/instance.ex

@@ -58,12 +58,15 @@ def run(["gen" | rest]) 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 @@ def run(["gen" | rest]) do
         EEx.eval_file(
           "sample_config.eex" |> Path.expand(__DIR__),
           domain: domain,
+          port: port,
           email: email,
           name: name,
           dbhost: dbhost,

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,