summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/config.exs12
-rw-r--r--config/description.exs24
-rw-r--r--docs/configuration/cheatsheet.md12
3 files changed, 24 insertions, 24 deletions
diff --git a/config/config.exs b/config/config.exs
index 935d4fc98..eb56723fa 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,15 +257,15 @@ config :pleroma, :instance,
password_reset_token_validity: 60 * 60 * 24,
profile_directory: true,
admin_privileges: [
- :users_delete,
+ :users_read,
+ :users_manage_invites,
+ :users_manage_activation_state,
+ :users_manage_tags,
:users_manage_credentials,
+ :users_delete,
:messages_read,
- :users_manage_tags,
- :users_manage_activation_state,
- :users_manage_invites,
- :reports_manage_reports,
- :users_read,
:messages_delete,
+ :reports_manage_reports,
:emoji_manage_emoji
],
moderator_privileges: [],
diff --git a/config/description.exs b/config/description.exs
index e2ff91fb3..66ae53d42 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -964,15 +964,15 @@ config :pleroma, :config_description, [
key: :admin_privileges,
type: {:list, :atom},
suggestions: [
- :users_delete,
+ :users_read,
+ :users_manage_invites,
+ :users_manage_activation_state,
+ :users_manage_tags,
:users_manage_credentials,
+ :users_delete,
:messages_read,
- :users_manage_tags,
- :users_manage_activation_state,
- :users_manage_invites,
- :reports_manage_reports,
- :users_read,
:messages_delete,
+ :reports_manage_reports,
:emoji_manage_emoji
],
description:
@@ -982,15 +982,15 @@ config :pleroma, :config_description, [
key: :moderator_privileges,
type: {:list, :atom},
suggestions: [
- :users_delete,
+ :users_read,
+ :users_manage_invites,
+ :users_manage_activation_state,
+ :users_manage_tags,
:users_manage_credentials,
+ :users_delete,
:messages_read,
- :users_manage_tags,
- :users_manage_activation_state,
- :users_manage_invites,
- :reports_manage_reports,
- :users_read,
:messages_delete,
+ :reports_manage_reports,
:emoji_manage_emoji
],
description:
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index c59c914f2..af82b6948 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -66,15 +66,15 @@ To add configuration to your config file, you can copy it from the base config.
* `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
* `admin_privileges`: A list of privileges an admin has (e.g. delete messages, manage reports...)
* Possible values are:
- * `:users_delete`
+ * `:users_read`
+ * `:users_manage_invites`
+ * `:users_manage_activation_state`
+ * `:users_manage_tags`
* `:users_manage_credentials`
+ * `:users_delete`
* `:messages_read`
- * `:users_manage_tags`
- * `:users_manage_activation_state`
- * `:users_manage_invites`
- * `:reports_manage_reports`
- * `:users_read`
* `:messages_delete`
+ * `:reports_manage_reports`
* `:emoji_manage_emoji`
* `moderator_privileges`: A list of privileges a moderator has (e.g. delete messages, manage reports...)
* Possible values are the same as for `admin_privileges`