Merge branch 'develop' into fix/configdb-otp-instructions

This commit is contained in:
Mark Felder 2020-07-30 13:04:49 -05:00
commit 24169ae2e6

View File

@ -44,6 +44,7 @@ INSERT INTO "config" ("group","key","value","inserted_at","updated_at") VALUES (
```
2. It is recommended to backup your config file now.
```
cp config/dev.secret.exs config/dev.secret.exs.orig
```
@ -86,14 +87,12 @@ INSERT INTO "config" ("group","key","value","inserted_at","updated_at") VALUES (
config :pleroma, configurable_from_database: true
```
5. Restart instance you can now access the Settings tab in AdminFE.
5. Restart your instance and you can now access the Settings tab in AdminFE.
## Reverting back from database config
1. Stop your Pleroma instance.
2. Run the mix task to migrate back from the database. You'll receive some debugging output and a few messages informing you of what happened.
1. Run the mix task to migrate back from the database. You'll receive some debugging output and a few messages informing you of what happened.
**Source:**
@ -118,7 +117,9 @@ SELECT c0."id", c0."key", c0."group", c0."value", c0."inserted_at", c0."updated_
Database configuration settings have been saved to config/dev.exported_from_db.secret.exs
```
3. The in-database configuration still exists, but it will not be used if you remove `config :pleroma, configurable_from_database: true` from your config.
2. Remove `config :pleroma, configurable_from_database: true` from your config. The in-database configuration still exists, but it will not be used. Future migrations will erase the database config before importing your config file again.
3. Restart your instance.
## Debugging