From d1a887b57a6243dcdbf33f00d4692f25b8f2b270 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 14 Feb 2020 04:56:13 -0600 Subject: add admin option to toggle auto-marking instance actors known & make enabling greylist federation also enable secure mode --- config/locales/en.yml | 5 ++++- config/settings.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'config') 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. Enables secure mode. 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: Disabling this will put the server in must-consent federation mode and require staff to manually approve server actors. + 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 -- cgit