diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-24 20:52:10 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-24 20:52:10 +0000 |
| commit | 035c2c1415ed46abb268cf85c141384416a799e2 (patch) | |
| tree | bbbe49672fee2527fa68c0252bb6ec13e1d62fdf /lib/mix/tasks | |
| parent | 908b6ee49a049e60d705e7f923e71326a965f360 (diff) | |
| parent | 5e4fe0e8f7fcfefc037885421d41de3a4328a881 (diff) | |
| download | pleroma-035c2c1415ed46abb268cf85c141384416a799e2.tar.gz | |
Merge branch 'fix/instance-gen-custom-static' into 'develop'
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 9af6cda30..2d8b8d673 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -6,6 +6,8 @@ defmodule Mix.Tasks.Pleroma.Instance do use Mix.Task import Mix.Pleroma + alias Pleroma.Config + @shortdoc "Manages Pleroma instance" @moduledoc File.read!("docs/administration/CLI_tasks/instance.md") @@ -153,6 +155,8 @@ defmodule Mix.Tasks.Pleroma.Instance do Pleroma.Config.get([:instance, :static_dir]) ) + Config.put([:instance, :static_dir], static_dir) + secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64) jwt_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) |