fix(server): selfhost startup (#9386)

toeverything · Dec 27, 2024 · a16471c · a16471c
1 parent 8bceece
commit a16471c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/.docker/selfhost/.env.example b/.docker/selfhost/.env.example
@@ -11,7 +11,7 @@ PORT=3010
 # AFFINE_SERVER_EXTERNAL_URL=https://affine.yourdomain.com
 
 # position of the database data to persist
-DB_DATA_LOCATION=~/.affine/self-host/postgres
+DB_DATA_LOCATION=~/.affine/self-host/postgres/pgdata
 # position of the upload data(images, files, etc.) to persist
 UPLOAD_LOCATION=~/.affine/self-host/storage
 # position of the configuration files to persist

diff --git a/.docker/selfhost/compose.yaml → .docker/selfhost/compose.yml b/.docker/selfhost/compose.yaml → .docker/selfhost/compose.yml
@@ -19,6 +19,7 @@ services:
     env_file:
       - .env
     environment:
+      - REDIS_SERVER_HOST=redis
       - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE:-affine}
     restart: unless-stopped
 
@@ -33,6 +34,7 @@ services:
     env_file:
       - .env
     environment:
+      - REDIS_SERVER_HOST=redis
       - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_DATABASE:-affine}
     depends_on:
       postgres:

diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
@@ -441,7 +441,7 @@ jobs:
           node-version: 20
       - name: Copy Selfhost Release Files
         run: |
-          cp ./.docker/selfhost/compose.yaml ./release/docker-compose.yaml
+          cp ./.docker/selfhost/compose.yml ./release/docker-compose.yml
           cp ./.docker/selfhost/.env.example ./release/.env.example
       - name: Generate Release yml
         run: |
@@ -456,7 +456,9 @@ jobs:
           body: ''
           draft: ${{ github.event.inputs.is-draft }}
           prerelease: ${{ github.event.inputs.is-pre-release }}
-          files: ./release/*
+          files: |
+            - ./release/*
+            - ./release/.env.example
       - name: Create Nightly Release Draft
         if: ${{ github.ref_type == 'branch' }}
         uses: softprops/action-gh-release@v2
@@ -471,4 +473,6 @@ jobs:
           body: ''
           draft: false
           prerelease: true
-          files: ./release/*
+          files: |
+            - ./release/*
+            - ./release/.env.example
diff --git a/packages/backend/server/src/prelude.ts b/packages/backend/server/src/prelude.ts
@@ -45,6 +45,7 @@ function loadPrivateKey() {
 }
 
 async function load() {
+  let isPrivateKeyFromEnv = !!process.env.AFFINE_PRIVATE_KEY;
   // Initializing AFFiNE config
   //
   // 1. load dotenv file to `process.env`
@@ -56,6 +57,12 @@ async function load() {
     path: join(CUSTOM_CONFIG_PATH, '.env'),
   });
 
+  // @deprecated
+  // The old AFFINE_PRIVATE_KEY in old .env is somehow not working, we should ignore it
+  if (!isPrivateKeyFromEnv) {
+    delete process.env.AFFINE_PRIVATE_KEY;
+  }
+
   // 2. generate AFFiNE default config and assign to `globalThis.AFFiNE`
   globalThis.AFFiNE = getAFFiNEConfigModifier();
   const { enablePlugin } = await import('./plugins/registry');