Compare commits

..

No commits in common. "a16045e9c997675137a0a6f4bf631c60bb9d5e96" and "8fee1741aba0769ed0208ae21ade9924ee95b83d" have entirely different histories.

2 changed files with 20 additions and 26 deletions

View File

@ -14,10 +14,10 @@ jobs:
run: | run: |
if [ "${{ gitea.ref_name }}" = "production" ]; then if [ "${{ gitea.ref_name }}" = "production" ]; then
echo "TARGET_DIR=/var/www/node/cdrdpyj" >> $GITHUB_ENV echo "TARGET_DIR=/var/www/node/cdrdpyj" >> $GITHUB_ENV
echo "APP_NAME=cdrdpyj-live" >> $GITHUB_ENV echo "PM2_ENV=production" >> $GITHUB_ENV
else else
echo "TARGET_DIR=/var/www/node/dev.cdrdjyp" >> $GITHUB_ENV echo "TARGET_DIR=/var/www/node/dev.cdrdjyp" >> $GITHUB_ENV
echo "APP_NAME=cdrdpyj" >> $GITHUB_ENV echo "PM2_ENV=staging" >> $GITHUB_ENV
fi fi
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
@ -53,7 +53,7 @@ jobs:
npm install -g pnpm@11 2>&1 npm install -g pnpm@11 2>&1
cd ${{ env.TARGET_DIR }} cd ${{ env.TARGET_DIR }}
pnpm install --prod 2>&1 pnpm install --prod 2>&1
sed -i "s|TURNSTILE_SITE_KEY: \"\"|TURNSTILE_SITE_KEY: \"${{ secrets.TURNSTILE_SITE_KEY }}\"|g" ecosystem.config.cjs 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 }}\"|g" ecosystem.config.cjs sed -i "s|TURNSTILE_SECRET_KEY: \"\"|TURNSTILE_SECRET_KEY: \"${{ secrets.TURNSTILE_SECRET_KEY }}\"|" ecosystem.config.cjs
pm2 reload ecosystem.config.cjs --only ${{ env.APP_NAME }} --update-env || \ pm2 reload ecosystem.config.cjs --env ${{ env.PM2_ENV }} --update-env || \
pm2 start ecosystem.config.cjs --only ${{ env.APP_NAME }} --update-env pm2 start ecosystem.config.cjs --env ${{ env.PM2_ENV }} --update-env

View File

@ -1,24 +1,18 @@
module.exports = { module.exports = {
apps: [ apps: [{
{ name: "cdrdpyj",
name: "cdrdpyj", script: "dist/server/entry.mjs",
script: "dist/server/entry.mjs", env: {
env: { NODE_ENV: "staging",
NODE_ENV: "staging", PORT: 3310,
PORT: 3310, TURNSTILE_SITE_KEY: "",
TURNSTILE_SITE_KEY: "", TURNSTILE_SECRET_KEY: "",
TURNSTILE_SECRET_KEY: "",
}
}, },
{ env_production: {
name: "cdrdpyj-live", NODE_ENV: "production",
script: "dist/server/entry.mjs", PORT: 4321,
env: { TURNSTILE_SITE_KEY: "",
NODE_ENV: "production", TURNSTILE_SECRET_KEY: "",
PORT: 4321,
TURNSTILE_SITE_KEY: "",
TURNSTILE_SECRET_KEY: "",
}
} }
] }]
}; };