From e926411812f5554520898e37e4876e708049249b Mon Sep 17 00:00:00 2001 From: Ryan He <204075+ryanho@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:00:34 +0800 Subject: [PATCH] chore: Add descriptions for "MeiliSearch" and "allowedPrivateNetworks" to example.yml (#12594) * Update example.yml, add descriptions for some items Add descriptions for "MeiliSearch" and "allowedPrivateNetworks" * Update docker_example.yml Add descriptions for "MeiliSearch" and "allowedPrivateNetworks" --- .config/docker_example.yml | 7 +++++++ .config/example.yml | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/.config/docker_example.yml b/.config/docker_example.yml index 2921746295..d1534486d3 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -106,12 +106,16 @@ redis: # ┌───────────────────────────┐ #───┘ MeiliSearch configuration └───────────────────────────── +# You can set scope to local (default value) or global +# (include notes from remote). + #meilisearch: # host: meilisearch # port: 7700 # apiKey: '' # ssl: true # index: '' +# scope: local # ┌───────────────┐ #───┘ ID generation └─────────────────────────────────────────── @@ -180,6 +184,9 @@ proxyRemoteFiles: true # Sign to ActivityPub GET request (default: true) signToActivityPubGet: true +# For security reasons, uploading attachments from the intranet is prohibited, +# but exceptions can be made from the following settings. Default value is "undefined". +# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)). #allowedPrivateNetworks: [ # '127.0.0.1/32' #] diff --git a/.config/example.yml b/.config/example.yml index 0e4f2f5a15..481c615587 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -118,6 +118,9 @@ redis: # ┌───────────────────────────┐ #───┘ MeiliSearch configuration └───────────────────────────── +# You can set scope to local (default value) or global +# (include notes from remote). + #meilisearch: # host: localhost # port: 7700 @@ -210,6 +213,9 @@ proxyRemoteFiles: true # Sign to ActivityPub GET request (default: true) signToActivityPubGet: true +# For security reasons, uploading attachments from the intranet is prohibited, +# but exceptions can be made from the following settings. Default value is "undefined". +# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)). #allowedPrivateNetworks: [ # '127.0.0.1/32' #]