Skip to content

Commit

Permalink
Revert "0.5.0やり直し (#146)" (#147)
Browse files Browse the repository at this point in the history 
This reverts commit 4139941.
  • Loading branch information
@1673beta
1673beta authored Aug 14, 2024
1 parent 4139941 commit b849955
Show file tree
Hide file tree
Showing 2,438 changed files with 34,498 additions and 103,964 deletions.
7 changes: 0 additions & 7 deletions .config/docker_example.env
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
# cherrypick settings
# CHERRYPICK_URL=https://example.tld/

# db settings
POSTGRES_PASSWORD=example-cherrypick-pass
# DATABASE_PASSWORD=${POSTGRES_PASSWORD}
POSTGRES_USER=example-cherrypick-user
# DATABASE_USER=${POSTGRES_USER}
POSTGRES_DB=cherrypick
# DATABASE_DB=${POSTGRES_DB}
DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"
35 changes: 0 additions & 35 deletions .config/docker_example.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#───┘ URL └─────────────────────────────────────────────────────

# Final accessible URL seen by a user.
# You can set url from an environment variable instead.
url: https://example.tld/

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
Expand Down Expand Up @@ -39,11 +38,9 @@ db:
port: 5432

# Database name
# You can set db from an environment variable instead.
db: cherrypick

# Auth
# You can set user and pass from environment variables instead.
user: example-cherrypick-user
pass: example-cherrypick-pass

Expand Down Expand Up @@ -120,19 +117,6 @@ redis:
# index: ''
# scope: local

# ┌───────────────────────────┐
#───┘ OpenSearch configuration └─────────────────────────────

# You can use OpenSearch when you enabled AdvancedSearch.

#opensearch:
# host: opensearch
# port: 9200
# user: 'admin'
# pass: 'opensearch-adminpassword' #強めのパスワードじゃないと怒られる
# ssl: false
# index: 'instancename' #なんでもいい

# ┌───────────────┐
#───┘ ID generation └───────────────────────────────────────────

Expand All @@ -152,21 +136,6 @@ 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 └─────────────────────────────────────

Expand Down Expand Up @@ -218,10 +187,6 @@ proxyBypassHosts:
# Media Proxy
#mediaProxy: https://example.com/proxy

# Proxy remote files endpoint
# remoteProxy: https://example.com/files/
# remoteProxy: /files/

# Proxy remote files (default: true)
proxyRemoteFiles: true

Expand Down
103 changes: 5 additions & 98 deletions .config/example.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,6 @@
# CherryPick configuration
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

# ┌──────────────────────────────┐
#───┘ a boring but important thing └────────────────────────────

#
# First of all, let me tell you a story that may possibly be
# boring to you and possibly important to you.
#
# CherryPick 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 CherryPick AS-IS (without any changes to
# the source code. forks are not included).
#
# Step 1: Congratulations! You don't need to do anything.

# --------
# Option 2: If you have made changes to the source code (forks
# are included) and publish a Git repository of source
# code. There should be no access restrictions on
# 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 CherryPick server first.
# Step 2: Open <https://your.cherrypick.example/admin/settings> in
# your browser with the administrator account.
# Step 3: Enter the URL of your Git repository in the
# "Repository URL" field.

# --------
# Option 3: If neither of the above applies to you.
# (In this case, the source code should be published
# on the CherryPick interface. IT IS NOT ENOUGH TO
# DISCLOSE THE SOURCE CODE WEHN 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
# 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
# to avoid ACCIDENTAL LEAKING OF SENSITIVE INFORMATION.
# To prevent certain files from being included in the
# tarball, add a glob pattern after line 15 in
# <scripts/tarball.mjs>. DO NOT FORGET TO BUILD AFTER
# ENABLING THIS OPTION!)
#
# Step 1: Uncomment the following line.
#
# publishTarballInsteadOfProvideRepositoryUrl: true

# ┌─────┐
#───┘ URL └─────────────────────────────────────────────────────

Expand Down Expand Up @@ -129,9 +72,6 @@ dbReplications: false
# user:
# pass:

# You can use PGroonga when enabled.
#pgroonga: false

# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────

Expand Down Expand Up @@ -178,7 +118,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:
Expand All @@ -189,20 +129,6 @@ redis:
# index: ''
# scope: local


# ┌───────────────────────────┐
#───┘ OpenSearch configuration └─────────────────────────────

# You can use OpenSearch when you enabled AdvancedSearch.

#opensearch:
# host: localhost
# port: 9200
# user: 'admin'
# pass: 'opensearch-adminpassword' #強めのパスワードじゃないと怒られる
# ssl: false
# index: 'instancename' #なんでもいい

# ┌───────────────┐
#───┘ ID generation └───────────────────────────────────────────

Expand All @@ -222,21 +148,6 @@ 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 └─────────────────────────────────────

Expand All @@ -249,14 +160,14 @@ id: 'aidx'
# Job concurrency per worker
#deliverJobConcurrency: 128
#inboxJobConcurrency: 16
#relationshipJobConcurrency: 16
# What's relationshipJob?:
#relashionshipJobConcurrency: 16
# What's relashionshipJob?:
# Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.

# Job rate limiter
#deliverJobPerSec: 128
#inboxJobPerSec: 32
#relationshipJobPerSec: 64
#relashionshipJobPerSec: 64

# Job attempts
#deliverJobMaxAttempts: 12
Expand Down Expand Up @@ -298,10 +209,6 @@ proxyBypassHosts:
# * Perform image compression (on a different server resource than the main process)
#mediaProxy: https://example.com/proxy

# Proxy remote files endpoint
# remoteProxy: https://example.com/files/
# remoteProxy: /files/

# Proxy remote files (default: true)
# Proxy remote files by this instance or mediaProxy to prevent remote files from running in remote domains.
proxyRemoteFiles: true
Expand All @@ -316,7 +223,7 @@ proxyRemoteFiles: 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".
# 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'
Expand Down
17 changes: 9 additions & 8 deletions .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"name": "CherryPick",
"dockerComposeFile": "compose.yml",
"dockerComposeFile": "docker-compose.yml",
"service": "app",
"workspaceFolder": "/workspace",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "20.16.0"
"ghcr.io/devcontainers-contrib/features/pnpm:2": {
"version": "8.9.2"
},
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
"ghcr.io/devcontainers/features/node:1": {
"version": "20.10.0"
}
},
"forwardPorts": [3000],
"postCreateCommand": "/bin/bash .devcontainer/init.sh",
"postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh",
"customizations": {
"vscode": {
"extensions": [
"editorconfig.editorconfig",
"dbaeumer.vscode-eslint",
"Vue.volar",
"Vue.vscode-typescript-vue-plugin",
"Orta.vscode-jest",
"dbaeumer.vscode-eslint",
"mrmlnc.vscode-json5",
"ms-vscode.vscode-typescript-next",
"oderwat.indent-rainbow"
"mrmlnc.vscode-json5"
]
}
}
Expand Down
15 changes: 0 additions & 15 deletions .devcontainer/devcontainer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,6 @@ 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 └─────────────────────────────────────

Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/compose.yml → .devcontainer/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version: '3.8'

services:
app:
build:
Expand All @@ -6,7 +8,6 @@ services:

volumes:
- ../:/workspace:cached
- node_modules:/workspace/node_modules

command: sleep infinity

Expand Down Expand Up @@ -45,7 +46,6 @@ services:
volumes:
postgres-data:
redis-data:
node_modules:

networks:
internal_network:
Expand Down
5 changes: 1 addition & 4 deletions .devcontainer/init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

set -xe

sudo chown node node_modules
git config --global --add safe.directory /workspace
sudo chown -R node /workspace
git submodule update --init
corepack install
corepack enable
pnpm config set store-dir /home/node/.local/share/pnpm/store
pnpm install --frozen-lockfile
cp .devcontainer/devcontainer.yml .config/default.yml
Expand Down
5 changes: 3 additions & 2 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ Dockerfile
build/
built/
db/
.devcontainer/compose.yml
docker-compose.yml
node_modules/
packages/*/node_modules
redis/
files/
misskey-assets/
fluent-emojis/
.pnp.*

Expand All @@ -27,6 +28,6 @@ fluent-emojis/

.idea/
packages/*/.vscode/
packages/backend/test/compose.yml
packages/backend/test/docker-compose.yml

.pnpm-store/
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

patreon: noridev
Loading

0 comments on commit b849955

Please sign in to comment.