merge upstream

.config/example.yml

@@ -1,5 +1,5 @@
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Misskey configuration
+# Sharkey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 #   ┌──────────────────────────────┐
@@ -9,14 +9,14 @@
 # First of all, let me tell you a story that may possibly be
 # boring to you and possibly important to you.
 #
-# Misskey is licensed under the AGPLv3 license. This license is
+# Sharkey is licensed under the AGPLv3 license. This license is
 # known to be often misunderstood.  Please read the following
 # instructions carefully and select the appropriate option so
 # that you do not negligently cause a license violation.
 #
 
 # --------
-# Option 1: If you host Misskey AS-IS (without any changes to
+# Option 1: If you host Sharkey AS-IS (without any changes to
 #           the source code. forks are not included).
 #
 # Step 1: Congratulations! You don't need to do anything.
@@ -28,8 +28,8 @@
 #           this repository.  Strictly speaking, it doesn't have
 #           to be a Git repository, but you'll probably use Git!
 #
-# Step 1: Build and run the Misskey server first.
-# Step 2: Open <https://your.misskey.example/admin/settings> in
+# Step 1: Build and run the Sharkey server first.
+# Step 2: Open <https://your.sharkey.example/admin/settings> in
 #         your browser with the administrator account.
 # Step 3: Enter the URL of your Git repository in the
 #         "Repository URL" field.
@@ -37,7 +37,7 @@
 # --------
 # 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
+#           on the Sharkey interface.  IT IS NOT ENOUGH TO
 #           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
@@ -65,10 +65,10 @@
 # Password to initiate setting up admin account.
 # It will not be used after the initial setup is complete.
 #
-# Be sure to change this when you set up Misskey via the Internet.
+# Be sure to change this when you set up Sharkey via the Internet.
 #
-# The provider of the service who sets up Misskey on behalf of the customer should
-# set this value to something unique when generating the Misskey config file,
+# The provider of the service who sets up Sharkey on behalf of the customer should
+# set this value to something unique when generating the Sharkey config file,
 # and provide it to the customer.
 #
 # setupPassword: example_password_please_change_this_or_you_will_get_hacked
@@ -86,11 +86,11 @@ url: https://example.tld/
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Misskey requires a reverse proxy to support HTTPS connections.
+# Sharkey requires a reverse proxy to support HTTPS connections.
 #
 #                 +----- https://example.tld/ ------------+
 #   +------+      |+-------------+      +----------------+|
-#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   | User | ---> || Proxy (443) | ---> | Sharkey (3000) ||
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
@@ -98,13 +98,13 @@ url: https://example.tld/
 #   An encrypted connection with HTTPS is highly recommended
 #   because tokens may be transferred in GET requests.
 
-# The port that your Misskey server should listen on.
+# The port that your Sharkey server should listen on.
 port: 3000
 # the address to bind to, defaults to "every address"
 # address: '0.0.0.0'
 
 # You can also use UNIX domain socket.
-# socket: /path/to/misskey.sock
+# socket: /path/to/sharkey.sock
 # chmodSocket: '777'
 
 #   ┌──────────────────────────┐
@@ -358,7 +358,7 @@ proxyRemoteFiles: true
 
 # Movie Thumbnail Generation URL
 # There is no reference implementation.
-# For example, Misskey will point to the following URL:
+# For example, Sharkey will point to the following URL:
 #   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
 #videoThumbnailGenerator: https://example.com
 
@@ -379,6 +379,11 @@ attachLdSignatureForRelays: true
 
 #customMOTD: ['Hello World', 'The sharks rule all', 'Shonks']
 
+# Disable automatic redirect for ActivityPub object lookup. (default: false)
+# This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation.
+# However it will make it impossible for other instances to lookup third-party user and notes through your URL.
+#disallowExternalApRedirect: true
+
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000