summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
-rw-r--r--config/prod.exs4
-rw-r--r--config/releases.exs1
-rw-r--r--config/test.exs3
4 files changed, 9 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs
index 3d2c6d48e..0642ee3c3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -244,7 +244,7 @@ config :pleroma, :instance,
safe_dm_mentions: false,
healthcheck: false,
remote_post_retention_days: 90,
- skip_thread_containment: false,
+ skip_thread_containment: true,
limit_unauthenticated_to_local_content: true
config :pleroma, :markup,
@@ -498,6 +498,8 @@ config :pleroma, :oauth2,
config :pleroma, :database, rum_enabled: false
+config :pleroma, :env, Mix.env()
+
config :http_signatures,
adapter: Pleroma.Signature
diff --git a/config/prod.exs b/config/prod.exs
index d0cfd1ac2..bf1a97de0 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
#
diff --git a/config/releases.exs b/config/releases.exs
new file mode 100644
index 000000000..becde7693
--- /dev/null
+++ b/config/releases.exs
@@ -0,0 +1 @@
+import Config
diff --git a/config/test.exs b/config/test.exs
index 95129f409..1c5eff794 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -27,7 +27,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test
config :pleroma, :instance,
email: "admin@example.com",
- notify_email: "noreply@example.com"
+ notify_email: "noreply@example.com",
+ skip_thread_containment: false
# Configure your database
config :pleroma, Pleroma.Repo,