Merge branch 'bugfix/wrong-date-format' into 'develop'

[akkoma] / lib / mix / tasks / pleroma / instance.ex

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index 88fc3ba759c157573f3ee4fe1dfe8e561dba0d06..1ba452275e376396ad0f15d9b6db05e2320c34c3 100644 (file)
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -1,6 +1,9 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Mix.Tasks.Pleroma.Instance do
   use Mix.Task
-  alias Pleroma.{Repo, User}
   alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages Pleroma instance"
@@ -59,21 +62,30 @@ defmodule Mix.Tasks.Pleroma.Instance do
     proceed? = Enum.empty?(will_overwrite) or Keyword.get(options, :force, false)
 
     unless not proceed? do
-      domain =
+      [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(
           options,
-          :domain,
-          "What domain will your instance use? (e.g pleroma.soykaf.com)"
+          :instance_name,
+          "What is the name of your instance? (e.g. Pleroma/Soykaf)"
         )
 
-      name =
-        Common.get_option(options, :name, "What is the name of your instance? (e.g. Pleroma/Soykaf)")
-
       email = Common.get_option(options, :admin_email, "What is your admin email address?")
 
-      dbhost = Common.get_option(options, :dbhost, "What is the hostname of your database?", "localhost")
+      dbhost =
+        Common.get_option(options, :dbhost, "What is the hostname of your database?", "localhost")
 
-      dbname = Common.get_option(options, :dbname, "What is the name of your database?", "pleroma_dev")
+      dbname =
+        Common.get_option(options, :dbname, "What is the name of your database?", "pleroma_dev")
 
       dbuser =
         Common.get_option(
@@ -93,11 +105,14 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
 
       secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
+      signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
+      {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
 
       result_config =
         EEx.eval_file(
           "sample_config.eex" |> Path.expand(__DIR__),
           domain: domain,
+          port: port,
           email: email,
           name: name,
           dbhost: dbhost,
@@ -105,7 +120,10 @@ defmodule Mix.Tasks.Pleroma.Instance do
           dbuser: dbuser,
           dbpass: dbpass,
           version: Pleroma.Mixfile.project() |> Keyword.get(:version),
-          secret: secret
+          secret: secret,
+          signing_salt: signing_salt,
+          web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
+          web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
         )
 
       result_psql =
@@ -145,7 +163,4 @@ defmodule Mix.Tasks.Pleroma.Instance do
       )
     end
   end
-
-
-
 end