diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 0dcdf21..1c198d8 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,10 +14,10 @@ jobs: run: | if [ "${{ gitea.ref_name }}" = "production" ]; then echo "TARGET_DIR=/var/www/node/cdrdpyj" >> $GITHUB_ENV - echo "PM2_ENV=production" >> $GITHUB_ENV + echo "APP_NAME=cdrdpyj-live" >> $GITHUB_ENV else - echo "TARGET_DIR=/var/www/node/dev.cdrdjyp" >> $GITHUB_ENV - echo "PM2_ENV=staging" >> $GITHUB_ENV + echo "TARGET_DIR=/var/www/node/dev.cdrdpyj" >> $GITHUB_ENV + echo "APP_NAME=cdrdpyj" >> $GITHUB_ENV fi - uses: pnpm/action-setup@v4 @@ -53,7 +53,7 @@ jobs: npm install -g pnpm@11 2>&1 cd ${{ env.TARGET_DIR }} pnpm install --prod 2>&1 - sed -i "s|TURNSTILE_SITE_KEY: \"\"|TURNSTILE_SITE_KEY: \"${{ secrets.TURNSTILE_SITE_KEY }}\"|" ecosystem.config.cjs - sed -i "s|TURNSTILE_SECRET_KEY: \"\"|TURNSTILE_SECRET_KEY: \"${{ secrets.TURNSTILE_SECRET_KEY }}\"|" ecosystem.config.cjs - pm2 reload ecosystem.config.cjs --env ${{ env.PM2_ENV }} --update-env || \ - pm2 start ecosystem.config.cjs --env ${{ env.PM2_ENV }} --update-env + sed -i "s|TURNSTILE_SITE_KEY: \"\"|TURNSTILE_SITE_KEY: \"${{ secrets.TURNSTILE_SITE_KEY }}\"|g" ecosystem.config.cjs + sed -i "s|TURNSTILE_SECRET_KEY: \"\"|TURNSTILE_SECRET_KEY: \"${{ secrets.TURNSTILE_SECRET_KEY }}\"|g" ecosystem.config.cjs + pm2 reload ecosystem.config.cjs --only ${{ env.APP_NAME }} --update-env || \ + pm2 start ecosystem.config.cjs --only ${{ env.APP_NAME }} --update-env diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs index 731aca9..77b1c53 100644 --- a/ecosystem.config.cjs +++ b/ecosystem.config.cjs @@ -1,18 +1,24 @@ module.exports = { - apps: [{ - name: "cdrdpyj", - script: "dist/server/entry.mjs", - env: { - NODE_ENV: "staging", - PORT: 3310, - TURNSTILE_SITE_KEY: "", - TURNSTILE_SECRET_KEY: "", + apps: [ + { + name: "cdrdpyj", + script: "dist/server/entry.mjs", + env: { + NODE_ENV: "staging", + PORT: 3310, + TURNSTILE_SITE_KEY: "", + TURNSTILE_SECRET_KEY: "", + } }, - env_production: { - NODE_ENV: "production", - PORT: 4321, - TURNSTILE_SITE_KEY: "", - TURNSTILE_SECRET_KEY: "", + { + name: "cdrdpyj-live", + script: "dist/server/entry.mjs", + env: { + NODE_ENV: "production", + PORT: 4321, + TURNSTILE_SITE_KEY: "", + TURNSTILE_SECRET_KEY: "", + } } - }] + ] };