reverts config gen

diff --git a/README.md b/README.md
index 175b90f88d20d00f6a044355e83d9ed03b23cde2..664b8b47548f950d6eed6781535095c47376f4c7 100644 (file)
--- 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/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 generate_config`. This will ask you a few questions about your instance and generate a configuration file in `config/generated_config.exs`. Check that and copy it to either `config/dev.secret.exs` or `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 95cf394be205d9e456a7acc0ac76ddfa3d2acd91..f20f93e4d0ee71a3fe71bc935798d89b71d7f016 100644 (file)
--- a/lib/mix/tasks/generate_config.ex
+++ b/lib/mix/tasks/generate_config.ex
@@ -4,7 +4,7 @@ defmodule Mix.Tasks.GenerateConfig do
   @shortdoc "Generates a new config"
   def run(_) do
     IO.puts("Answer a few questions to generate a new config\n")
-    IO.puts("--- THIS WILL OVERWRITE YOUR config/dev.secret.exs AND config/prod.secret.exs! ---\n")
+    IO.puts("--- THIS WILL OVERWRITE YOUR config/generated_config.exs! ---\n")
     domain = IO.gets("What is your domain name? (e.g. pleroma.soykaf.com): ") |> String.trim
     name = IO.gets("What is the name of your instance? (e.g. Pleroma/Soykaf): ") |> String.trim
     email = IO.gets("What's your admin email address: ") |> String.trim
@@ -13,10 +13,10 @@ 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 config to config/generated_config.exs.\n\nCheck it and configure your database, then copy it to either config/dev.secret.exs or config/prod.secret.exs")
+    File.write("config/generated_config.exs", result)
     IO.puts("\nWriting setup_db.psql, please run it as postgre superuser, i.e.: sudo 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)
   end
 end