diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-05-31 12:26:07 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-05-31 12:26:07 +0100 |
| commit | 3372e0ffe153d996bdf04ae3d834633d0ba18fca (patch) | |
| tree | 7a46452030b2a2ca24d1ea9158fa5f0f75000245 /.config | |
| parent | Merge branch 'develop' into future (diff) | |
| parent | Bump version to 2024.5.0-rc.9 (diff) | |
| download | sharkey-3372e0ffe153d996bdf04ae3d834633d0ba18fca.tar.gz sharkey-3372e0ffe153d996bdf04ae3d834633d0ba18fca.tar.bz2 sharkey-3372e0ffe153d996bdf04ae3d834633d0ba18fca.zip | |
Merge remote-tracking branch 'misskey/release/2024.5.0' into future
Diffstat (limited to '.config')
| -rw-r--r-- | .config/docker_example.yml | 19 | ||||
| -rw-r--r-- | .config/example.yml | 15 |
2 files changed, 32 insertions, 2 deletions
diff --git a/.config/docker_example.yml b/.config/docker_example.yml index 296237c95d..c22bd83c2e 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -163,7 +163,7 @@ redis: # ┌───────────────────────────┐ #───┘ MeiliSearch configuration └───────────────────────────── -# You can set scope to local (default value) or global +# You can set scope to local (default value) or global # (include notes from remote). #meilisearch: @@ -193,6 +193,21 @@ redis: id: 'aidx' +# ┌────────────────┐ +#───┘ Error tracking └────────────────────────────────────────── + +# Sentry is available for error tracking. +# See the Sentry documentation for more details on options. + +#sentryForBackend: +# enableNodeProfiling: true +# options: +# dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0' + +#sentryForFrontend: +# options: +# dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0' + # ┌─────────────────────┐ #───┘ Other configuration └───────────────────────────────────── @@ -261,7 +276,7 @@ signToActivityPubGet: true checkActivityPubGetSignature: false # For security reasons, uploading attachments from the intranet is prohibited, -# but exceptions can be made from the following settings. Default value is "undefined". +# 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 73ee1c5346..9126bdfd91 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -205,6 +205,21 @@ redis: id: 'aidx' +# ┌────────────────┐ +#───┘ Error tracking └────────────────────────────────────────── + +# Sentry is available for error tracking. +# See the Sentry documentation for more details on options. + +#sentryForBackend: +# enableNodeProfiling: true +# options: +# dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0' + +#sentryForFrontend: +# options: +# dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0' + # ┌─────────────────────┐ #───┘ Other configuration └───────────────────────────────────── |