diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-03 09:31:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-03 09:31:38 +0300 |
| commit | 4e14945670bac15a6e183eb8c552d6e0669713ac (patch) | |
| tree | c25db5253cafb81dbfa31cc779ffae8e07806b7e /lib/mix/tasks | |
| parent | cf4765af4098098fa4d6996193432bd19c439a75 (diff) | |
| parent | fd2477dfba1f167c7519a029bedd7ae6884a9f1d (diff) | |
| download | pleroma-4e14945670bac15a6e183eb8c552d6e0669713ac.tar.gz pleroma-4e14945670bac15a6e183eb8c552d6e0669713ac.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index f272fdb7f..da27a99d0 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -242,6 +242,13 @@ defmodule Mix.Tasks.Pleroma.Instance do rum_enabled: rum_enabled ) + config_dir = Path.dirname(config_path) + psql_dir = Path.dirname(psql_path) + + [config_dir, psql_dir, static_dir, uploads_dir] + |> Enum.reject(&File.exists?/1) + |> Enum.map(&File.mkdir_p!/1) + shell_info("Writing config to #{config_path}.") File.write(config_path, result_config) @@ -275,10 +282,6 @@ defmodule Mix.Tasks.Pleroma.Instance do indexable: indexable ) - unless File.exists?(static_dir) do - File.mkdir_p!(static_dir) - end - robots_txt_path = Path.join(static_dir, "robots.txt") if File.exists?(robots_txt_path) do |