From 4a895a46d111286e5c6cf923b9fdb4e50115104a Mon Sep 17 00:00:00 2001
From: Rin Toshaka <rinpatch@sdf.org>
Date: Sat, 15 Dec 2018 11:00:54 +0100
Subject: Allow port specification in instance.ex

---
 lib/mix/tasks/pleroma/instance.ex       | 16 ++++++++++------
 lib/mix/tasks/pleroma/sample_config.eex |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'lib/mix/tasks')

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,
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
index 0cd572797..740b9f8d1 100644
--- 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,
-- 
cgit v1.2.3


From 22d483d4f74ff404fd6ae0cd88d2e5bcc7cceaf6 Mon Sep 17 00:00:00 2001
From: link0ff <juri@linkov.net>
Date: Sun, 16 Dec 2018 18:25:31 +0200
Subject: Use bindings dbuser and dbname in sample_psql.eex

---
 lib/mix/tasks/pleroma/sample_psql.eex |  6 +++---
 lib/mix/tasks/pleroma/user.ex         | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/sample_psql.eex b/lib/mix/tasks/pleroma/sample_psql.eex
index c89b34ef2..f0ac05e57 100644
--- a/lib/mix/tasks/pleroma/sample_psql.eex
+++ b/lib/mix/tasks/pleroma/sample_psql.eex
@@ -1,6 +1,6 @@
-CREATE USER pleroma WITH ENCRYPTED PASSWORD '<%= dbpass %>';
-CREATE DATABASE pleroma_dev OWNER pleroma;
-\c pleroma_dev;
+CREATE USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>';
+CREATE DATABASE <%= dbname %> OWNER <%= dbuser %>;
+\c <%= dbname %>;
 --Extensions made by ecto.migrate that need superuser access
 CREATE EXTENSION IF NOT EXISTS citext;
 CREATE EXTENSION IF NOT EXISTS pg_trgm;
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index fe6e6935f..3d30e3a81 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -94,16 +94,14 @@ defmodule Mix.Tasks.Pleroma.User do
     unless not proceed? do
       Common.start_pleroma()
 
-      params =
-        %{
-          nickname: nickname,
-          email: email,
-          password: password,
-          password_confirmation: password,
-          name: name,
-          bio: bio
-        }
-        |> IO.inspect()
+      params = %{
+        nickname: nickname,
+        email: email,
+        password: password,
+        password_confirmation: password,
+        name: name,
+        bio: bio
+      }
 
       user = User.register_changeset(%User{}, params)
       Repo.insert!(user)
-- 
cgit v1.2.3