mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
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
This commit is contained in:
commit
1f2aad6fda
3 changed files with 9 additions and 0 deletions
|
@ -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.
|
- 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`
|
- Emoji Packs could not be listed when instance was set to `public: false`
|
||||||
- Fix whole_word always returning false on filter get requests
|
- 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)]
|
## [Unreleased (patch)]
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,10 @@ defmodule Mix.Tasks.Pleroma.Ecto.Migrate do
|
||||||
load_pleroma()
|
load_pleroma()
|
||||||
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
|
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
|
||||||
|
|
||||||
|
if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do
|
||||||
|
Application.ensure_all_started(:ssl)
|
||||||
|
end
|
||||||
|
|
||||||
opts =
|
opts =
|
||||||
if opts[:to] || opts[:step] || opts[:all],
|
if opts[:to] || opts[:step] || opts[:all],
|
||||||
do: opts,
|
do: opts,
|
||||||
|
|
|
@ -40,6 +40,10 @@ defmodule Mix.Tasks.Pleroma.Ecto.Rollback do
|
||||||
load_pleroma()
|
load_pleroma()
|
||||||
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
|
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
|
||||||
|
|
||||||
|
if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do
|
||||||
|
Application.ensure_all_started(:ssl)
|
||||||
|
end
|
||||||
|
|
||||||
opts =
|
opts =
|
||||||
if opts[:to] || opts[:step] || opts[:all],
|
if opts[:to] || opts[:step] || opts[:all],
|
||||||
do: opts,
|
do: opts,
|
||||||
|
|
Loading…
Reference in a new issue