diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-02-14 16:21:51 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-14 16:21:51 -0600 |
| commit | 4f7e76a1308cc35f97f47a9f42c197aeca9ee2de (patch) | |
| tree | 8030ac9944cbd39b7fb3bae2a089bf3d302ea90a /config | |
| parent | 803d632ea1063068645d11fca99c0dc624fbb86d (diff) | |
split auto-trust instance actor setting into auto-trust & always trust
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 7 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index ee7af2eb8..6d5c4f093 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -521,8 +521,11 @@ en: 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 if graylist mode is also disabled.</strong> - title: Always mark server actor accounts as known + desc_html: Automatically allow server actor accounts to fetch resources from this server when marking accounts known. + title: Auto-trust server actors + always_mark_instance_actors_known: + desc_html: Always allow server actor accounts to fetch resources from this server. May reduce privacy. + title: Always trust server actors 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 de990fdbe..23f77c55e 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -71,6 +71,7 @@ defaults: &defaults werewolf_status: true spam_check_enabled: true auto_mark_instance_actors_known: true + always_mark_instance_actors_known: false development: <<: *defaults |