From a71393dd29488eb86d6da23250b05a9b5b04eb81 Mon Sep 17 00:00:00 2001
From: Alexander <alex.strizhakov@gmail.com>
Date: Tue, 10 Dec 2019 12:00:40 +0300
Subject: [PATCH] fix for endpoints after env update
---
lib/mix/tasks/pleroma/config.ex | 4 +++-
lib/pleroma/config/transfer_task.ex | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index cef02b864..257a0dfe5 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -74,7 +74,9 @@ defmodule Mix.Tasks.Pleroma.Config do
defp load_and_create(group) do
group
|> Application.get_all_env()
- |> Enum.reject(fn {k, _v} -> k in [Pleroma.Repo, :env] end)
+ |> Enum.reject(fn {k, _v} ->
+ k in [Pleroma.Repo, :env] or (group == :phoenix and k == :serve_endpoints)
+ end)
|> Enum.each(fn {key, value} ->
key = inspect(key)
{:ok, _} = Config.update_or_create(%{group: inspect(group), key: key, value: value})
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex
index 0bc4c4029..c89c1fcc8 100644
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@ -37,7 +37,9 @@ defmodule Pleroma.Config.TransferTask do
group = Config.from_string(setting.group)
value = Config.from_binary(setting.value)
- :ok = Application.put_env(group, key, value)
+ if group != :phoenix and key != :serve_endpoints do
+ :ok = Application.put_env(group, key, value)
+ end
group
rescue
--
2.49.0