pleroma

commit: 6906db512dee7aa041b98c25312dabafd43ad932
parent: 2437f5128407bbcdfc152ea3f008d7eecc1728f2
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 21 Jun 2019 17:27:00 +0000

Merge branch 'move-sample-configs' into 'develop'

Move config templates to priv so they can be found in releases

See merge request pleroma/pleroma!1318
Diffstat:
M
lib/mix/tasks/pleroma/instance.ex
11
++++++-----
R
lib/mix/tasks/pleroma/robots_txt.eex -> priv/templates/robots_txt.eex
0

R
lib/mix/tasks/pleroma/sample_config.eex -> priv/templates/sample_config.eex
0

R
lib/mix/tasks/pleroma/sample_psql.eex -> priv/templates/sample_psql.eex
0

4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
@@ -155,10 +155,11 @@ defmodule Mix.Tasks.Pleroma.Instance do
       secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
       signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
       {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
+      template_dir = Application.app_dir(:pleroma, "priv") <> "/templates"
 
       result_config =
         EEx.eval_file(
-          "sample_config.eex" |> Path.expand(__DIR__),
+          template_dir <> "/sample_config.eex",
           domain: domain,
           port: port,
           email: email,
@@ -179,7 +180,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
       result_psql =
         EEx.eval_file(
-          "sample_psql.eex" |> Path.expand(__DIR__),
+          template_dir <> "/sample_psql.eex",
           dbname: dbname,
           dbuser: dbuser,
           dbpass: dbpass
@@ -193,7 +194,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
       shell_info("Writing #{psql_path}.")
       File.write(psql_path, result_psql)
 
-      write_robots_txt(indexable)
+      write_robots_txt(indexable, template_dir)
 
       shell_info(
         "\n" <>
@@ -217,10 +218,10 @@ defmodule Mix.Tasks.Pleroma.Instance do
     end
   end
 
-  defp write_robots_txt(indexable) do
+  defp write_robots_txt(indexable, template_dir) do
     robots_txt =
       EEx.eval_file(
-        Path.expand("robots_txt.eex", __DIR__),
+        template_dir <> "/robots_txt.eex",
         indexable: indexable
       )
 
diff --git a/lib/mix/tasks/pleroma/robots_txt.eex b/priv/templates/robots_txt.eex
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/priv/templates/sample_config.eex
diff --git a/lib/mix/tasks/pleroma/sample_psql.eex b/priv/templates/sample_psql.eex