From: Henry Jameson <me@hjkos.com>
Date: Mon, 27 Nov 2017 21:42:03 +0000 (+0300)
Subject: fixes
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=40714031176f28ed1af2ed83f01b1d066badb871;p=akkoma

fixes
---

diff --git a/README.md b/README.md
index 01a56d6bf..175b90f88 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ No release has been made yet, but several servers have been online for months al
 
   * Run `mix deps.get` to install elixir dependencies.
 
-  * Run `mix generate_config`. This will ask you a few questions about your instance and generate a configuration file in `config/dev.secret.exs` and `config/prod.secret.exs`. It will also create a `config/db_setup.psql`, which you need to run as PostgreSQL superuser (i.e. `sudo su - postgre -c "psql -f config/db_setup.psql"`). It will setup a pleroma db user, database and will setup needed extensions that need to be set up once as superuser.
+  * Run `mix generate_config`. This will ask you a few questions about your instance and generate a configuration file in `config/dev.secret.exs` and `config/prod.secret.exs`. It will also create a `config/setup_db.psql`, which you need to run as PostgreSQL superuser (i.e. `sudo su postgres -c "psql -f config/setup_db.psql"`). It will setup a pleroma db user, database and will setup needed extensions that need to be set up once as superuser.
 
   * Run `mix ecto.migrate` to run the database migrations. You will have to do this again after certain updates.
 
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex
index f9399b114..d06cc1a84 100644
--- a/lib/mix/tasks/generate_config.ex
+++ b/lib/mix/tasks/generate_config.ex
@@ -14,7 +14,7 @@ defmodule Mix.Tasks.GenerateConfig do
     resultSql = EEx.eval_file("lib/mix/tasks/sample_psql.eex", [dbpass: dbpass])
     result = EEx.eval_file("lib/mix/tasks/sample_config.eex", [domain: domain, email: email, name: name, secret: secret, dbpass: dbpass])
     IO.puts("\nWriting config to config/dev.secret.exs and config/prod.secret.exs")
-    IO.puts("\nWriting setup_db.psql, please run it as postgre superuser, i.e. su - postgre -c 'psql -f setup_db.psql'")
+    IO.puts("\nWriting setup_db.psql, please run it as postgre superuser, i.e. su - postgres -c 'psql -f config/setup_db.psql'")
     File.write("config/dev.secret.exs", result)
     File.write("config/prod.secret.exs", result)
     File.write("config/setup_db.psql", resultSql)