diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-06 15:04:46 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-06 15:04:46 +0700 |
| commit | 157bceeda9124cea7ba69eaf6639ca52b3fac7c6 (patch) | |
| tree | bb4b2b3c2199750002026b917b5d825ad41514fc /config | |
| parent | 1f3c452d864eff625dfd0f25c48abe0efef4507b (diff) | |
| download | pleroma-157bceeda9124cea7ba69eaf6639ca52b3fac7c6.tar.gz pleroma-157bceeda9124cea7ba69eaf6639ca52b3fac7c6.zip | |
Move runtime configuration from `:instance` to `:modules`
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/releases.exs | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index e1358eda0..64e33c82f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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. diff --git a/config/releases.exs b/config/releases.exs index 98c5ceccd..b224960db 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -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" |