From: lain <lain@soykaf.club>
Date: Fri, 28 Jun 2019 15:26:09 +0000 (+0000)
Subject: Merge branch 'release-docs' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2286f62a36a0f5d738892a9283a696b8a45b45a6;p=akkoma

Merge branch 'release-docs' into 'develop'

Docs on OTP releases

See merge request pleroma/pleroma!1315
---

2286f62a36a0f5d738892a9283a696b8a45b45a6
diff --cc lib/mix/tasks/pleroma/instance.ex
index 997eabbeb,7022d173d..a27c4b897
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@@ -194,16 -183,13 +194,14 @@@ defmodule Mix.Tasks.Pleroma.Instance d
            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)