X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Finstance.ex;h=2ae16adc0d73378f59a95364d3fbd26cb9ab8613;hb=9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96;hp=c6738dbcc0506053ecca649b039a97b31a78c51b;hpb=e3534f5b3c68f9bf6a10c5fc10aa637ef66ab82e;p=akkoma

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index c6738dbcc..2ae16adc0 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -29,6 +29,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
   - `--dbname DBNAME` - the name of the database to use
   - `--dbuser DBUSER` - the user (aka role) to use for the database connection
   - `--dbpass DBPASS` - the password to use for the database connection
+  - `--rum Y/N` - Whether to enable RUM indexes
   - `--indexable Y/N` - Allow/disallow indexing site by search engines
   - `--db-configurable Y/N` - Allow/disallow configuring instance from admin part
   - `--uploads-dir` - the directory uploads go in when using a local uploader
@@ -51,6 +52,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           dbname: :string,
           dbuser: :string,
           dbpass: :string,
+          rum: :string,
           indexable: :string,
           db_configurable: :string,
           uploads_dir: :string,
@@ -112,12 +114,12 @@ defmodule Mix.Tasks.Pleroma.Instance do
           options,
           :db_configurable,
           "Do you want to store the configuration in the database (allows controlling it from admin-fe)? (y/n)",
-          "y"
+          "n"
         ) === "y"
 
       dbhost = 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 = get_option(options, :dbname, "What is the name of your database?", "pleroma")
 
       dbuser =
         get_option(
@@ -136,10 +138,18 @@ defmodule Mix.Tasks.Pleroma.Instance do
           "autogenerated"
         )
 
+      rum_enabled =
+        get_option(
+          options,
+          :rum,
+          "Would you like to use RUM indices?",
+          "n"
+        ) === "y"
+
       uploads_dir =
         get_option(
           options,
-          :upload_dir,
+          :uploads_dir,
           "What directory should media uploads go in (when using the local uploader)?",
           Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads])
         )
@@ -175,7 +185,8 @@ defmodule Mix.Tasks.Pleroma.Instance do
           web_push_private_key: Base.url_encode64(web_push_private_key, padding: false),
           db_configurable?: db_configurable?,
           static_dir: static_dir,
-          uploads_dir: uploads_dir
+          uploads_dir: uploads_dir,
+          rum_enabled: rum_enabled
         )
 
       result_psql =
@@ -183,31 +194,20 @@ defmodule Mix.Tasks.Pleroma.Instance do
           template_dir <> "/sample_psql.eex",
           dbname: dbname,
           dbuser: dbuser,
-          dbpass: dbpass
+          dbpass: dbpass,
+          rum_enabled: rum_enabled
         )
 
-      shell_info(
-        "Writing config to #{config_path}. You should rename it to config/prod.secret.exs or config/dev.secret.exs."
-      )
+      shell_info("Writing config to #{config_path}.")
 
       File.write(config_path, result_config)
-      shell_info("Writing #{psql_path}.")
+      shell_info("Writing the postgres script to #{psql_path}.")
       File.write(psql_path, result_psql)
 
       write_robots_txt(indexable, template_dir)
 
       shell_info(
-        "\n" <>
-          """
-          To get started:
-          1. Verify the contents of the generated files.
-          2. Run `sudo -u postgres psql -f #{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'`."
-          end
+        "\n All files successfully written! Refer to the installation instructions for your platform for next steps"
       )
     else
       shell_error(