summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan He <204075+ryanho@users.noreply.github.com>2023-12-07 16:00:34 +0800
committerGitHub <noreply@github.com>2023-12-07 17:00:34 +0900
commite926411812f5554520898e37e4876e708049249b (patch)
tree5844f2a74762d2efde0104a7a0950acfc2cd7c5e
parentrefactor(frontend): 非推奨となったReactivity Transformを使わない... (diff)
downloadsharkey-e926411812f5554520898e37e4876e708049249b.tar.gz
sharkey-e926411812f5554520898e37e4876e708049249b.tar.bz2
sharkey-e926411812f5554520898e37e4876e708049249b.zip
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"
-rw-r--r--.config/docker_example.yml7
-rw-r--r--.config/example.yml6
2 files changed, 13 insertions, 0 deletions
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'
#]