diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-11 13:26:59 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-11 13:26:59 +0700 |
| commit | 182f7bbb1170c44eac4ab4a9efa4ff0bff991c98 (patch) | |
| tree | f4c6fe46e82f667be49c8e6aad0ed3b418e4332f /config/prod.exs | |
| parent | ddd4a09b72ede65345ddf45a68eb239b54eda86c (diff) | |
| parent | 4016341a77337e3b71295d27808eebc05152b086 (diff) | |
| download | pleroma-182f7bbb1170c44eac4ab4a9efa4ff0bff991c98.tar.gz pleroma-182f7bbb1170c44eac4ab4a9efa4ff0bff991c98.zip | |
Merge branch 'develop' into feature/addressable-lists
Diffstat (limited to 'config/prod.exs')
| -rw-r--r-- | config/prod.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/prod.exs b/config/prod.exs index d0cfd1ac2..9c205cbd2 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -17,8 +17,10 @@ config :pleroma, Pleroma.Web.Endpoint, http: [port: 4000], protocol: "http" +config :phoenix, serve_endpoints: true + # Do not print debug messages in production -config :logger, level: :info +config :logger, level: :warn # ## SSL Support # @@ -61,3 +63,6 @@ config :logger, level: :info # Finally import the config/prod.secret.exs # which should be versioned separately. import_config "prod.secret.exs" + +if File.exists?("./config/prod.exported_from_db.secret.exs"), + do: import_config("prod.exported_from_db.secret.exs") |