From acae1181206b4c11cc55a699343f302bd1471160 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 4 Jan 2019 12:29:39 +0100
Subject: [PATCH] Add mod and moderator to list of default reserved usernames
(#9713)
---
config/settings.yml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/config/settings.yml b/config/settings.yml
index b3d2e0240..4f7c2c8f3 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,11 +1,6 @@
-# config/app.yml for rails-settings-cached
-#
-# This file contains default values, and does not need to be edited
-# when configuring an instance. These settings may be changed by an
-# Administrator using the Web UI.
-#
-# For more information, see docs/Running-Mastodon/Administration-guide.md
-#
+# This file contains default values, and does not need to be edited. All
+# important settings can be changed from the admin interface.
+
defaults: &defaults
site_title: Mastodon
site_short_description: ''
@@ -54,11 +49,14 @@ defaults: &defaults
- root
- webmaster
- administrator
+ - mod
+ - moderator
disallowed_hashtags: # space separated string or list of hashtags without the hash
bootstrap_timeline_accounts: ''
activity_api_enabled: true
peers_api_enabled: true
show_known_fediverse_at_about_page: true
+
development:
<<: *defaults