diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-12-08 12:31:14 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-12-08 12:31:14 +0000 |
| commit | d7da3ca05d87ce7c0c799031c00dd1a80aba9c18 (patch) | |
| tree | a9e694be48fc48d00ca8ec9738ec64a21906aaa8 /lib | |
| parent | afd0ea37f3284bdfa6ddce99162601615b7ad845 (diff) | |
| parent | 964e2dd2f055207ac8fa7f8b3612e50860a0472a (diff) | |
| download | pleroma-d7da3ca05d87ce7c0c799031c00dd1a80aba9c18.tar.gz | |
Merge branch 'postgresetup' into 'develop'
first version of safe DB setup
See merge request pleroma/pleroma!32
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/generate_config.ex | 7 | ||||
| -rw-r--r-- | lib/mix/tasks/sample_config.eex | 4 | ||||
| -rw-r--r-- | lib/mix/tasks/sample_psql.eex | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index b3bc14d5b..f20f93e4d 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -9,9 +9,14 @@ defmodule Mix.Tasks.GenerateConfig do 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 secret = :crypto.strong_rand_bytes(64) |> Base.encode64 |> binary_part(0, 64) + dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64 |> binary_part(0, 64) + + 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]) - result = EEx.eval_file("lib/mix/tasks/sample_config.eex", [domain: domain, email: email, name: name, secret: secret]) 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/setup_db.psql", resultSql) end end diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 62a9804fe..85a7c554e 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -13,8 +13,8 @@ config :pleroma, :instance, # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, - username: "postgres", - password: "postgres", + username: "pleroma", + password: "<%= dbpass %>", database: "pleroma_dev", hostname: "localhost", pool_size: 10 diff --git a/lib/mix/tasks/sample_psql.eex b/lib/mix/tasks/sample_psql.eex new file mode 100644 index 000000000..18e322efc --- /dev/null +++ b/lib/mix/tasks/sample_psql.eex @@ -0,0 +1,8 @@ +CREATE USER pleroma WITH ENCRYPTED PASSWORD '<%= dbpass %>' CREATEDB; +-- in case someone runs this second time accidentally +ALTER USER pleroma WITH ENCRYPTED PASSWORD '<%= dbpass %>' CREATEDB; +CREATE DATABASE pleroma_dev; +ALTER DATABASE pleroma_dev OWNER TO pleroma; +\c pleroma_dev; +--Extensions made by ecto.migrate that need superuser access +CREATE EXTENSION IF NOT EXISTS citext; |