logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 1f2aad6fda22a3af8b475b5e4a01eae95a3438da
parent: ec242b470654e5e66e3d3a36e8d7563e15b08016
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 17 Aug 2020 08:44:26 +0000

Merge branch 'fix/start-ssl-if-ssl-required' into 'develop'

Start :ssl if not started when running migration or rollback

Closes #2056

See merge request pleroma/pleroma!2894

Diffstat:

MCHANGELOG.md1+
Mlib/mix/tasks/pleroma/ecto/migrate.ex4++++
Mlib/mix/tasks/pleroma/ecto/rollback.ex4++++
3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -105,6 +105,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix edge case where MediaProxy truncates media, usually caused when Caddy is serving content for the other Federated instance. - Emoji Packs could not be listed when instance was set to `public: false` - Fix whole_word always returning false on filter get requests +- Migrations not working on OTP releases if the database was connected over ssl ## [Unreleased (patch)] diff --git a/lib/mix/tasks/pleroma/ecto/migrate.ex b/lib/mix/tasks/pleroma/ecto/migrate.ex @@ -41,6 +41,10 @@ defmodule Mix.Tasks.Pleroma.Ecto.Migrate do load_pleroma() {opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases) + if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do + Application.ensure_all_started(:ssl) + end + opts = if opts[:to] || opts[:step] || opts[:all], do: opts, diff --git a/lib/mix/tasks/pleroma/ecto/rollback.ex b/lib/mix/tasks/pleroma/ecto/rollback.ex @@ -40,6 +40,10 @@ defmodule Mix.Tasks.Pleroma.Ecto.Rollback do load_pleroma() {opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases) + if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do + Application.ensure_all_started(:ssl) + end + opts = if opts[:to] || opts[:step] || opts[:all], do: opts,