X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Freleases.exs;h=19636765f51b6381ff6e18581c50fbd204624c29;hb=19e559fe5130f66a967732a40ccea1ac39e85eb8;hp=36c49367384be2eb63b9089ffdfbfd6ae1f1b278;hpb=fb5dce481c8225579648ec52379a8f5611686196;p=akkoma diff --git a/config/releases.exs b/config/releases.exs index 36c493673..19636765f 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -1,10 +1,13 @@ import Config -config :pleroma, :instance, static: "/var/lib/pleroma/static" +config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" +config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules" config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs" +config :pleroma, release: true, config_path: config_path + if File.exists?(config_path) do import_config config_path else @@ -17,3 +20,12 @@ else IO.puts(warning) end + +exported_config = + config_path + |> Path.dirname() + |> Path.join("prod.exported_from_db.secret.exs") + +if File.exists?(exported_config) do + import_config exported_config +end