aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2017-11-26 20:57:49 +0300
committerHenry Jameson <me@hjkos.com>2017-12-04 03:56:54 +0300
commit0673511d3939c04efd0e3fd350c47b4bfb3e322e (patch)
treeadec2ac87dc761bf744202103f7d3f20391cf92d /lib
parentd08a34e88b0d42f403755e1bdbaf015784ebbe74 (diff)
downloadpleroma-0673511d3939c04efd0e3fd350c47b4bfb3e322e.tar.gz
first version of safe DB setup
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/generate_config.ex13
-rw-r--r--lib/mix/tasks/sample_config.eex4
-rw-r--r--lib/mix/tasks/sample_psql.eex6
3 files changed, 17 insertions, 6 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex
index b3bc14d5b..f9399b114 100644
--- a/lib/mix/tasks/generate_config.ex
+++ b/lib/mix/tasks/generate_config.ex
@@ -4,14 +4,19 @@ 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/generated_config.exs! ---\n")
+ IO.puts("--- THIS WILL OVERWRITE YOUR config/dev.secret.exs AND config/prod.secret.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
secret = :crypto.strong_rand_bytes(64) |> Base.encode64 |> binary_part(0, 64)
+ dbpass = :crypto.strong_rand_bytes(64) |> Base.encode64 |> binary_part(0, 64)
- 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)
+ 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'")
+ File.write("config/dev.secret.exs", result)
+ File.write("config/prod.secret.exs", result)
+ 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..5353fa216
--- /dev/null
+++ b/lib/mix/tasks/sample_psql.eex
@@ -0,0 +1,6 @@
+CREATE 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 citext;