aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-05-02 16:22:21 +0000
committerrinpatch <rinpatch@sdf.org>2020-05-02 16:22:21 +0000
commit019a192e43c2421c74e5126e753aac095db8ad54 (patch)
tree3415b92ed0cb9e59f39946a1439fd918c6ea07ee /docs
parent3b15a0eecc62f79465620a697f12b576ed87b0fc (diff)
parent04f23294d327f044a72ecd3f269846c2f6198cf1 (diff)
downloadpleroma-2.0.3.tar.gz
Merge branch 'release/2.0.3' into 'stable'v2.0.3
Release/2.0.3 See merge request pleroma/secteam/pleroma!3
Diffstat (limited to 'docs')
-rw-r--r--docs/API/admin_api.md21
-rw-r--r--docs/configuration/hardening.md2
2 files changed, 18 insertions, 5 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md
index edcf73e14..26f3b1932 100644
--- a/docs/API/admin_api.md
+++ b/docs/API/admin_api.md
@@ -773,6 +773,8 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
### Restarts pleroma application
+**Only works when configuration from database is enabled.**
+
- Params: none
- Response:
- On failure:
@@ -782,11 +784,24 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
{}
```
+## `GET /api/pleroma/admin/need_reboot`
+
+### Returns the flag whether the pleroma should be restarted
+
+- Params: none
+- Response:
+ - `need_reboot` - boolean
+```json
+{
+ "need_reboot": false
+}
+```
+
## `GET /api/pleroma/admin/config`
### Get list of merged default settings with saved in database.
-*If `need_reboot` flag exists in response, instance must be restarted, so reboot time settings can take effect.*
+*If `need_reboot` is `true`, instance must be restarted, so reboot time settings can take effect.*
**Only works when configuration from database is enabled.**
@@ -808,13 +823,12 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
"need_reboot": true
}
```
- need_reboot - *optional*, if were changed reboot time settings.
## `POST /api/pleroma/admin/config`
### Update config settings
-*If `need_reboot` flag exists in response, instance must be restarted, so reboot time settings can take effect.*
+*If `need_reboot` is `true`, instance must be restarted, so reboot time settings can take effect.*
**Only works when configuration from database is enabled.**
@@ -956,7 +970,6 @@ config :quack,
"need_reboot": true
}
```
-need_reboot - *optional*, if were changed reboot time settings.
## ` GET /api/pleroma/admin/config/descriptions`
diff --git a/docs/configuration/hardening.md b/docs/configuration/hardening.md
index b54c28850..d3bfc4e4a 100644
--- a/docs/configuration/hardening.md
+++ b/docs/configuration/hardening.md
@@ -36,7 +36,7 @@ content-security-policy:
default-src 'none';
base-uri 'self';
frame-ancestors 'none';
- img-src 'self' data: https:;
+ img-src 'self' data: blob: https:;
media-src 'self' https:;
style-src 'self' 'unsafe-inline';
font-src 'self';