X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Finstance.ex;h=c6632270783ad84ee14b933fabb657b93240ad22;hb=94d8f1ab305b513931b81d7a4b3e41e30b688a16;hp=6a85880bfcf2221717f8e2ebb0dc634ef70423a8;hpb=03b2d1016d25ab2b17a5a511249b4df59c4743fd;p=akkoma

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index 6a85880bf..c66322707 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -1,6 +1,7 @@
 defmodule Mix.Tasks.Pleroma.Instance do
   use Mix.Task
   alias Pleroma.{Repo, User}
+  alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages Pleroma instance"
   @moduledoc """
@@ -8,7 +9,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
   ## Generate a new instance config.
 
-    mix pleroma.instance new [OPTION...]
+    mix pleroma.instance gen [OPTION...]
 
   If any options are left unspecified, you will be prompted interactively
 
@@ -26,7 +27,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
   - `--dbpass DBPASS` - the password to use for the database connection
   """
 
-  def run(["new" | rest]) do
+  def run(["gen" | rest]) do
     {options, [], []} =
       OptionParser.parse(
         rest,
@@ -59,23 +60,29 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
     unless not proceed? do
       domain =
-        get_option(
+        Common.get_option(
           options,
           :domain,
           "What domain will your instance use? (e.g pleroma.soykaf.com)"
         )
 
       name =
-        get_option(options, :name, "What is the name of your instance? (e.g. Pleroma/Soykaf)")
+        Common.get_option(
+          options,
+          :name,
+          "What is the name of your instance? (e.g. Pleroma/Soykaf)"
+        )
 
-      email = get_option(options, :admin_email, "What is your admin email address?")
+      email = Common.get_option(options, :admin_email, "What is your admin email address?")
 
-      dbhost = 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 = 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 =
-        get_option(
+        Common.get_option(
           options,
           :dbuser,
           "What is the user used to connect to your database?",
@@ -83,7 +90,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
 
       dbpass =
-        get_option(
+        Common.get_option(
           options,
           :dbpass,
           "What is the password used to connect to your database?",
@@ -92,6 +99,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
 
       secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
+      {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
 
       result_config =
         EEx.eval_file(
@@ -104,7 +112,9 @@ defmodule Mix.Tasks.Pleroma.Instance do
           dbuser: dbuser,
           dbpass: dbpass,
           version: Pleroma.Mixfile.project() |> Keyword.get(:version),
-          secret: secret
+          secret: secret,
+          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 =
@@ -128,12 +138,12 @@ defmodule Mix.Tasks.Pleroma.Instance do
           """
           To get started:
           1. Verify the contents of the generated files.
-          2. Run `sudo -u postgres psql -f #{escape_sh_path(psql_path)}`.
+          2. Run `sudo -u postgres psql -f #{Common.escape_sh_path(psql_path)}`.
           """ <>
           if config_path in ["config/dev.secret.exs", "config/prod.secret.exs"] do
             ""
           else
-            "3. Run `mv #{escape_sh_path(config_path)} 'config/prod.secret.exs'`."
+            "3. Run `mv #{Common.escape_sh_path(config_path)} 'config/prod.secret.exs'`."
           end
       )
     else
@@ -144,22 +154,4 @@ defmodule Mix.Tasks.Pleroma.Instance do
       )
     end
   end
-
-  defp escape_sh_path(path) do
-    ~S(') <> String.replace(path, ~S('), ~S(\')) <> ~S(')
-  end
-
-  defp get_option(options, opt, prompt, def \\ nil, defname \\ nil) do
-    Keyword.get(options, opt) ||
-      case Mix.shell().prompt("#{prompt} [#{defname || def}]") do
-        "\n" ->
-          case def do
-            nil -> get_option(options, opt, prompt, def)
-            def -> def
-          end
-
-        opt ->
-          opt |> String.trim()
-      end
-  end
 end