forked from misskey-dev/misskey
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into inner-quote
- Loading branch information
Showing
770 changed files
with
25,969 additions
and
10,703 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,224 @@ | ||
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ | ||
# Misskey configuration | ||
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ | ||
|
||
# ┌────────────────────────┐ | ||
#───┘ Initial Setup Password └───────────────────────────────────────────────────── | ||
|
||
# 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. | ||
# | ||
# 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, | ||
# and provide it to the customer. | ||
setupPassword: example_password_please_change_this_or_you_will_get_hacked | ||
|
||
# ┌─────┐ | ||
#───┘ URL └───────────────────────────────────────────────────── | ||
|
||
# Final accessible URL seen by a user. | ||
url: 'http://misskey.local' | ||
|
||
# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE | ||
# URL SETTINGS AFTER THAT! | ||
|
||
# ┌───────────────────────┐ | ||
#───┘ Port and TLS settings └─────────────────────────────────── | ||
|
||
# | ||
# Misskey requires a reverse proxy to support HTTPS connections. | ||
# | ||
# +----- https://example.tld/ ------------+ | ||
# +------+ |+-------------+ +----------------+| | ||
# | User | ---> || Proxy (443) | ---> | Misskey (3000) || | ||
# +------+ |+-------------+ +----------------+| | ||
# +---------------------------------------+ | ||
# | ||
# You need to set up a reverse proxy. (e.g. nginx) | ||
# 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. | ||
port: 61812 | ||
|
||
# ┌──────────────────────────┐ | ||
#───┘ PostgreSQL configuration └──────────────────────────────── | ||
|
||
db: | ||
host: db | ||
port: 5432 | ||
|
||
# Database name | ||
db: misskey | ||
|
||
# Auth | ||
user: postgres | ||
pass: postgres | ||
|
||
# Whether disable Caching queries | ||
#disableCache: true | ||
|
||
# Extra Connection options | ||
#extra: | ||
# ssl: true | ||
|
||
dbReplications: false | ||
|
||
# You can configure any number of replicas here | ||
#dbSlaves: | ||
# - | ||
# host: | ||
# port: | ||
# db: | ||
# user: | ||
# pass: | ||
# - | ||
# host: | ||
# port: | ||
# db: | ||
# user: | ||
# pass: | ||
|
||
# ┌─────────────────────┐ | ||
#───┘ Redis configuration └───────────────────────────────────── | ||
|
||
redis: | ||
host: redis | ||
port: 6379 | ||
#family: 0 # 0=Both, 4=IPv4, 6=IPv6 | ||
#pass: example-pass | ||
#prefix: example-prefix | ||
#db: 1 | ||
|
||
#redisForPubsub: | ||
# host: redis | ||
# port: 6379 | ||
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6 | ||
# #pass: example-pass | ||
# #prefix: example-prefix | ||
# #db: 1 | ||
|
||
#redisForJobQueue: | ||
# host: redis | ||
# port: 6379 | ||
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6 | ||
# #pass: example-pass | ||
# #prefix: example-prefix | ||
# #db: 1 | ||
|
||
#redisForTimelines: | ||
# host: redis | ||
# port: 6379 | ||
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6 | ||
# #pass: example-pass | ||
# #prefix: example-prefix | ||
# #db: 1 | ||
|
||
#redisForReactions: | ||
# host: redis | ||
# port: 6379 | ||
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6 | ||
# #pass: example-pass | ||
# #prefix: example-prefix | ||
# #db: 1 | ||
|
||
# ┌───────────────────────────┐ | ||
#───┘ MeiliSearch configuration └───────────────────────────── | ||
|
||
#meilisearch: | ||
# host: meilisearch | ||
# port: 7700 | ||
# apiKey: '' | ||
# ssl: true | ||
# index: '' | ||
|
||
# ┌───────────────┐ | ||
#───┘ ID generation └─────────────────────────────────────────── | ||
|
||
# You can select the ID generation method. | ||
# You don't usually need to change this setting, but you can | ||
# change it according to your preferences. | ||
|
||
# Available methods: | ||
# aid ... Short, Millisecond accuracy | ||
# aidx ... Millisecond accuracy | ||
# meid ... Similar to ObjectID, Millisecond accuracy | ||
# ulid ... Millisecond accuracy | ||
# objectid ... This is left for backward compatibility | ||
|
||
# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE | ||
# ID SETTINGS AFTER THAT! | ||
|
||
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://[email protected]/0' | ||
|
||
#sentryForFrontend: | ||
# options: | ||
# dsn: 'https://[email protected]/0' | ||
|
||
# ┌─────────────────────┐ | ||
#───┘ Other configuration └───────────────────────────────────── | ||
|
||
# Whether disable HSTS | ||
#disableHsts: true | ||
|
||
# Number of worker processes | ||
#clusterLimit: 1 | ||
|
||
# Job concurrency per worker | ||
# deliverJobConcurrency: 128 | ||
# inboxJobConcurrency: 16 | ||
|
||
# Job rate limiter | ||
# deliverJobPerSec: 128 | ||
# inboxJobPerSec: 32 | ||
|
||
# Job attempts | ||
# deliverJobMaxAttempts: 12 | ||
# inboxJobMaxAttempts: 8 | ||
|
||
# IP address family used for outgoing request (ipv4, ipv6 or dual) | ||
#outgoingAddressFamily: ipv4 | ||
|
||
# Proxy for HTTP/HTTPS | ||
#proxy: http://127.0.0.1:3128 | ||
|
||
proxyBypassHosts: | ||
- api.deepl.com | ||
- api-free.deepl.com | ||
- www.recaptcha.net | ||
- hcaptcha.com | ||
- challenges.cloudflare.com | ||
|
||
# Proxy for SMTP/SMTPS | ||
#proxySmtp: http://127.0.0.1:3128 # use HTTP/1.1 CONNECT | ||
#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4 | ||
#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 | ||
|
||
# Media Proxy | ||
#mediaProxy: https://example.com/proxy | ||
|
||
# Proxy remote files (default: true) | ||
proxyRemoteFiles: true | ||
|
||
# Sign to ActivityPub GET request (default: true) | ||
signToActivityPubGet: true | ||
|
||
allowedPrivateNetworks: [ | ||
'127.0.0.1/32' | ||
] | ||
|
||
# Upload or download file size limits (bytes) | ||
#maxFileSize: 262144000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ jobs: | |
- run: corepack enable | ||
|
||
- name: Setup Node.js | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ jobs: | |
- name: Checkout head | ||
uses: actions/[email protected] | ||
- name: Setup Node.js | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
node-version-file: '.node-version' | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,14 +21,15 @@ jobs: | |
uses: actions/[email protected] | ||
with: | ||
submodules: true | ||
persist-credentials: false | ||
ref: refs/pull/${{ github.event.pull_request.number }}/merge | ||
|
||
- name: setup pnpm | ||
uses: pnpm/action-setup@v4 | ||
|
||
- name: setup node | ||
id: setup-node | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: pnpm | ||
|
@@ -57,7 +58,7 @@ jobs: | |
name: generated-misskey-js | ||
path: packages/misskey-js/generator/built/autogen | ||
|
||
# pull_request_target safety: permissions: read-all, and there are no secrets used in this job | ||
# pull_request_target safety: permissions: read-all, and no user codes are executed | ||
get-actual-misskey-js: | ||
runs-on: ubuntu-latest | ||
permissions: | ||
|
@@ -68,6 +69,7 @@ jobs: | |
uses: actions/[email protected] | ||
with: | ||
submodules: true | ||
persist-credentials: false | ||
ref: refs/pull/${{ github.event.pull_request.number }}/merge | ||
|
||
- name: Upload From Merged | ||
|
@@ -131,3 +133,7 @@ jobs: | |
mode: delete | ||
message: "Thank you!" | ||
create_if_not_exists: false | ||
|
||
- name: Make failure if changes are detected | ||
if: steps.check-changes.outputs.changes == 'true' | ||
run: exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.