merge: Merge upstream 2025.2.0 (!886)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/886

Approved-by: Marie <github@yuugi.dev>
Approved-by: Amber Null <puppygirlhornyposting@gmail.com>

1 files changed, 33 insertions, 5 deletions

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index ce2daf3aec..1e03e902bf 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -38,14 +38,14 @@
 # Option 3: If neither of the above applies to you.
 #           (In this case, the source code should be published
 #           on the Misskey interface.  IT IS NOT ENOUGH TO
-#           DISCLOSE THE SOURCE CODE WEHN A USER REQUESTS IT BY
+#           DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY
 #           E-MAIL OR OTHER MEANS.  If you are not satisfied
 #           with this, it is recommended that you read the
 #           license again carefully.  Anyway, enabling this
 #           option will automatically generate and publish a
 #           tarball at build time, protecting you from
 #           inadvertent license violations. (There is no legal
-#           guarantee, of course.)  The tarball will generated
+#           guarantee, of course.)  The tarball will be generated
 #           from the root directory of your codebase.  So it is
 #           also recommended to check <built/tarball> directory
 #           once after building and before activating the server
@@ -171,10 +171,28 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#   ┌───────────────────────────┐
-#───┘ MeiliSearch configuration └─────────────────────────────
+#   ┌───────────────────────────────┐
+#───┘ Fulltext search configuration └─────────────────────────────
 
-# You can set scope to local (default value) or global
+# These are the setting items for the full-text search provider.
+fulltextSearch:
+  # You can select the ID generation method.
+  # - sqlLike (default)
+  #   Use SQL-like search.
+  #   This is a standard feature of PostgreSQL, so no special extensions are required.
+  # - sqlPgroonga
+  #   Use pgroonga.
+  #   You need to install pgroonga and configure it as a PostgreSQL extension.
+  #   In addition to the above, you need to create a pgroonga index on the text column of the note table.
+  #   see: https://pgroonga.github.io/tutorial/
+  # - meilisearch
+  #   Use Meilisearch.
+  #   You need to install Meilisearch and configure.
+  provider: sqlLike
+
+# For Meilisearch settings.
+# If you select "meilisearch" for "fulltextSearch.provider", it must be set.
+# You can set scope to local or global (default value)
 # (include notes from remote).
 
 #meilisearch:
@@ -317,3 +335,13 @@ checkActivityPubGetSignature: false
 # Permission bits are specified as a base-8 string representing User/Group/Other permissions.
 # This setting is only useful for custom deployments, such as using a reverse proxy to serve media.
 #filePermissionBits: '644'
+
+# Log settings
+# logging:
+#   sql:
+#     # Outputs query parameters during SQL execution to the log.
+#     # default: false
+#     enableQueryParamLogging: false
+#     # Disable query truncation. If set to true, the full text of the query will be output to the log.
+#     # default: false
+#     disableQueryTruncation: false