diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-17 16:35:19 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-17 16:35:19 +0000 |
| commit | d2dacadb6b223449d8eab3d7a32e29da9f2adde7 (patch) | |
| tree | 7adf28be34051ad87eaf72e10595a4249604992b /config | |
| parent | e5b34f5e0544371603bc2b570c26ede3182c2f8b (diff) | |
| parent | ef63cf70883f4c7e3814ebac907f000da835ea10 (diff) | |
| download | pleroma-d2dacadb6b223449d8eab3d7a32e29da9f2adde7.tar.gz pleroma-d2dacadb6b223449d8eab3d7a32e29da9f2adde7.zip | |
Merge branch 'rum-index' into 'develop'
Search: Use RUM index.
See merge request pleroma/pleroma!1136
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 61e2648a9..e82f08e07 100644 --- a/config/config.exs +++ b/config/config.exs @@ -465,6 +465,8 @@ config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true +config :pleroma, :database, rum_enabled: false + config :http_signatures, adapter: Pleroma.Signature diff --git a/config/test.exs b/config/test.exs index 40db66170..e1785d10f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -63,6 +63,10 @@ config :pleroma, :app_account_creation, max_requests: 5 config :pleroma, :http_security, report_uri: "https://endpoint.com" +rum_enabled = System.get_env("RUM_ENABLED") == "true" +config :pleroma, :database, rum_enabled: rum_enabled +IO.puts("RUM enabled: #{rum_enabled}") + try do import_config "test.secret.exs" rescue |