Move runtime configuration from :instance to :modules

This commit is contained in:
Egor Kislitsyn 2019-12-06 15:04:46 +07:00
commit 157bceeda9
4 changed files with 14 additions and 4 deletions

View file

@ -249,7 +249,6 @@ config :pleroma, :instance,
quarantined_instances: [],
managed_config: true,
static_dir: "instance/static/",
custom_modules_dir: "instance/modules/",
allowed_post_formats: [
"text/plain",
"text/html",
@ -618,6 +617,8 @@ config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
config :pleroma, :modules, runtime_dir: "instance/modules"
config :swarm, node_blacklist: [~r/myhtml_.*$/]
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.

View file

@ -2,6 +2,7 @@ import Config
config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules"
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"