diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-10 19:34:19 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-10 19:34:19 +0300 |
| commit | 7d128ca2083d83486a05d8c4456aa4090006e781 (patch) | |
| tree | 5c4c7e9f918de6d8140c1d137ce62eee5969a349 /config | |
| parent | 958d0452e4e52f44301e4d9211fc965c1c184363 (diff) | |
| download | pleroma-7d128ca2083d83486a05d8c4456aa4090006e781.tar.gz pleroma-7d128ca2083d83486a05d8c4456aa4090006e781.zip | |
dynamic_configuration renaming
and moving it from instance settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 19 |
2 files changed, 15 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 103361b29..df677c2e0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -269,7 +269,6 @@ config :pleroma, :instance, remote_post_retention_days: 90, skip_thread_containment: true, limit_to_local_content: :unauthenticated, - dynamic_configuration: false, user_bio_length: 5000, user_name_length: 100, max_account_fields: 10, @@ -623,6 +622,8 @@ config :pleroma, :web_cache_ttl, config :pleroma, :modules, runtime_dir: "instance/modules" +config :pleroma, configurable_from_database: false + 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/description.exs b/config/description.exs index 285c8b19c..3c5febf05 100644 --- a/config/description.exs +++ b/config/description.exs @@ -868,12 +868,6 @@ config :pleroma, :config_description, [ ] }, %{ - key: :dynamic_configuration, - type: :boolean, - description: - "Allow transferring configuration to DB with the subsequent customization from Admin api. Defaults to `false`" - }, - %{ key: :max_account_fields, type: :integer, description: "The maximum number of custom fields in the user profile (default: 10)", @@ -3111,5 +3105,18 @@ config :pleroma, :config_description, [ description: "A path to custom Elixir modules (such as MRF policies)." } ] + }, + %{ + group: :pleroma, + type: :group, + description: "Allow instance configuration from database.", + children: [ + %{ + key: :configurable_from_database, + type: :boolean, + description: + "Allow transferring configuration to DB with the subsequent customization from Admin api. Defaults to `false`" + } + ] } ] |