diff options
| author | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
| commit | cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (patch) | |
| tree | e80078875de15734e045f39e0bd9f82310961201 /config/test.exs | |
| parent | 0e2b5a3e6aed7947909c2a1ff1618403546f1572 (diff) | |
| parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
| download | pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.tar.gz pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.zip | |
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index 3f606aa81..567780987 100644 --- a/config/test.exs +++ b/config/test.exs @@ -29,7 +29,8 @@ config :pleroma, :instance, email: "admin@example.com", notify_email: "noreply@example.com", skip_thread_containment: false, - federating: false + federating: false, + external_user_synchronization: false config :pleroma, :activitypub, sign_object_fetches: false @@ -70,7 +71,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :rate_limit, search: [{1000, 30}, {1000, 30}], app_account_creation: {10_000, 5}, - password_reset: {1000, 30} + password_reset: {1000, 30}, + ap_routes: nil config :pleroma, :http_security, report_uri: "https://endpoint.com" @@ -80,6 +82,8 @@ rum_enabled = System.get_env("RUM_ENABLED") == "true" config :pleroma, :database, rum_enabled: rum_enabled IO.puts("RUM enabled: #{rum_enabled}") +config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp35v0RK9SO8WTPr6QZ" + config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock if File.exists?("./config/test.secret.exs") do |