about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-14 04:56:13 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-14 04:56:13 -0600
commitd1a887b57a6243dcdbf33f00d4692f25b8f2b270 (patch)
treeca0a22bf04a78a6b5d74b135700f8fe316a5d497 /config
parent9d6b593379d1d826391c58585c7f5121323b9410 (diff)
add admin option to toggle auto-marking instance actors known & make enabling greylist federation also enable secure mode
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml5
-rw-r--r--config/settings.yml1
2 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 451bc3335..22c5ba87b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -515,11 +515,14 @@ en:
         desc_html: Display public timeline on landing page
         title: Timeline preview
       auto_reject_unknown:
-        desc_html: Automatically reject unknown accounts from newly-federated servers.
+        desc_html: Automatically reject unknown accounts from newly-federated servers.  <strong>Enables secure mode.</strong>
         title: Graylist federation mode
       auto_mark_known:
         desc_html: Learn known accounts from outgoing interactions and incoming repeats from packmates.
         title: Auto-learn known accounts
+      auto_mark_instance_actors_known:
+        desc_html: <strong>Disabling this will put the server in must-consent federation mode and require staff to manually approve server actors.</strong>
+        title: Always mark server actor accounts as known
       werewolf_status:
         desc_html: Enable werewolf status Easter egg (requires an announcer account)
         title: Werewolf status
diff --git a/config/settings.yml b/config/settings.yml
index 5585af0f9..de990fdbe 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -70,6 +70,7 @@ defaults: &defaults
   auto_mark_known: true
   werewolf_status: true
   spam_check_enabled: true
+  auto_mark_instance_actors_known: true
 
 development:
   <<: *defaults