dynamic_configuration renaming
and moving it from instance settings
This commit is contained in:
parent
958d0452e4
commit
7d128ca208
13 changed files with 59 additions and 53 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -867,12 +867,6 @@ config :pleroma, :config_description, [
|
|||
false
|
||||
]
|
||||
},
|
||||
%{
|
||||
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,
|
||||
|
|
@ -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`"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue