summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2019-06-14 15:45:05 +0000
committerkaniini <nenolod@gmail.com>2019-06-14 15:45:05 +0000
commitc2ca1f22a25d22d6d863406ed05b08c643e5824c (patch)
treebf75fc306788d784d74fb6ca617f3ddd27b75fd2 /config
parentb7fc722a2e9e93341229cb122aac605421782295 (diff)
downloadpleroma-c2ca1f22a25d22d6d863406ed05b08c643e5824c.tar.gz
pleroma-c2ca1f22a25d22d6d863406ed05b08c643e5824c.zip
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/dev.exs3
-rw-r--r--config/prod.exs3
3 files changed, 8 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index f866e8d2b..7f46a8755 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -245,7 +245,8 @@ config :pleroma, :instance,
healthcheck: false,
remote_post_retention_days: 90,
skip_thread_containment: true,
- limit_to_local_content: :unauthenticated
+ limit_to_local_content: :unauthenticated,
+ dynamic_configuration: false
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
diff --git a/config/dev.exs b/config/dev.exs
index 0432adce7..71b11f7c3 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -59,3 +59,6 @@ else
"!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
)
end
+
+if File.exists?("./config/dev.migrated.secret.exs"),
+ do: import_config("./config/dev.migrated.secret.exs")
diff --git a/config/prod.exs b/config/prod.exs
index bf1a97de0..42edccf64 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -63,3 +63,6 @@ config :logger, level: :warn
# Finally import the config/prod.secret.exs
# which should be versioned separately.
import_config "prod.secret.exs"
+
+if File.exists?("./config/prod.migrated.secret.exs"),
+ do: import_config("./config/prod.migrated.secret.exs")