aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/API/admin_api.md4
-rw-r--r--docs/admin/config.md10
-rw-r--r--docs/configuration/cheatsheet.md9
3 files changed, 10 insertions, 13 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md
index cd4916248..f2a0906b8 100644
--- a/docs/API/admin_api.md
+++ b/docs/API/admin_api.md
@@ -684,7 +684,7 @@ Copies all settings from database to `config/{env}.exported_from_db.secret.exs`
### Get saved config settings
-**Only works when `:dynamic_configuration` is `true`.**
+**Only works when configuration from database is enabled.**
- Params: none
- Response:
@@ -708,7 +708,7 @@ Copies all settings from database to `config/{env}.exported_from_db.secret.exs`
### Update config settings
-**Only works when `:dynamic_configuration` is `true`.**
+**Only works when configuration from database is enabled.**
Some modifications are necessary to save the config settings correctly:
diff --git a/docs/admin/config.md b/docs/admin/config.md
index f42ec8975..41ca8fd58 100644
--- a/docs/admin/config.md
+++ b/docs/admin/config.md
@@ -1,9 +1,8 @@
# Configuring instance
-You can configure your instance from admin interface. You need account with admin rights and little change in config file, which will allow settings dynamic configuration from database.
+You can configure your instance from admin interface. You need account with admin rights and little change in config file, which will allow settings configuration from database.
```elixir
-config :pleroma, :instance,
- dynamic_configuration: true
+config :pleroma, configurable_from_database: true
```
## How it works
@@ -48,10 +47,9 @@ rm -rf config/prod.exported_from_db.exs
```
*If you don't want to backup settings, you can skip step with `cp` command.*
-3. Set dynamic configuration to `false`.
+3. Set configurable_from_database to `false`.
```elixir
-config :pleroma, :instance,
- dynamic_configuration: false
+config :pleroma, configurable_from_database: false
```
4. Restart pleroma instance
```bash
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 336fd3e11..30d673eba 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -70,11 +70,6 @@ You shouldn't edit the base config directly to avoid breakages and merge conflic
* `account_field_value_length`: An account field value maximum length (default: `2048`).
* `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
-!!! danger
- This is a Work In Progress, not usable just yet
-
-* `dynamic_configuration`: Allow transferring configuration to DB with the subsequent customization from Admin api.
-
## Federation
### MRF policies
@@ -841,3 +836,7 @@ config :auto_linker,
## Custom Runtime Modules (`:modules`)
* `runtime_dir`: A path to custom Elixir modules (such as MRF policies).
+
+
+## :configurable_from_database
+Enable/disable configuration from database.