Skip to content

Commit 96fcbf6

Browse files
committed
ci: update env vars for api
1 parent b83fc62 commit 96fcbf6

2 files changed

Lines changed: 7 additions & 27 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,13 @@ jobs:
3939
- name: Validate required secrets
4040
shell: bash
4141
env:
42-
PROD_VPS_USER: ${{ secrets.PROD_VPS_USER }}
43-
PROD_VPS_HOST: ${{ secrets.PROD_VPS_HOST }}
4442
PROD_VPS_PASSWORD: ${{ secrets.PROD_VPS_PASSWORD }}
45-
PROD_PUBLIC_ORIGIN: ${{ secrets.PROD_PUBLIC_ORIGIN }}
4643
PROD_TELEGRAM_BOT_TOKEN: ${{ secrets.PROD_TELEGRAM_BOT_TOKEN }}
47-
PROD_TELEGRAM_BOT_USERNAME: ${{ secrets.PROD_TELEGRAM_BOT_USERNAME }}
48-
PROD_TELEGRAM_MINI_APP_SHORT_NAME: ${{ secrets.PROD_TELEGRAM_MINI_APP_SHORT_NAME }}
4944
run: |
5045
missing=()
5146
for name in \
52-
PROD_VPS_USER \
53-
PROD_VPS_HOST \
5447
PROD_VPS_PASSWORD \
55-
PROD_PUBLIC_ORIGIN \
5648
PROD_TELEGRAM_BOT_TOKEN \
57-
PROD_TELEGRAM_BOT_USERNAME \
58-
PROD_TELEGRAM_MINI_APP_SHORT_NAME
5949
do
6050
if [[ -z "${!name}" ]]; then
6151
missing+=("$name")
@@ -75,19 +65,9 @@ jobs:
7565

7666
- name: Deploy production stack
7767
env:
78-
PROD_VPS_USER: ${{ secrets.PROD_VPS_USER }}
79-
PROD_VPS_HOST: ${{ secrets.PROD_VPS_HOST }}
8068
PROD_VPS_PASSWORD: ${{ secrets.PROD_VPS_PASSWORD }}
81-
PROD_PUBLIC_ORIGIN: ${{ secrets.PROD_PUBLIC_ORIGIN }}
8269
PROD_TELEGRAM_BOT_TOKEN: ${{ secrets.PROD_TELEGRAM_BOT_TOKEN }}
83-
PROD_TELEGRAM_BOT_USERNAME: ${{ secrets.PROD_TELEGRAM_BOT_USERNAME }}
84-
PROD_TELEGRAM_MINI_APP_SHORT_NAME: ${{ secrets.PROD_TELEGRAM_MINI_APP_SHORT_NAME }}
8570
run: |
8671
bash ./scripts/deploy-prod.sh \
87-
"$PROD_VPS_USER" \
88-
"$PROD_VPS_HOST" \
8972
"$PROD_VPS_PASSWORD" \
90-
"$PROD_TELEGRAM_BOT_TOKEN" \
91-
"$PROD_TELEGRAM_BOT_USERNAME" \
92-
"$PROD_TELEGRAM_MINI_APP_SHORT_NAME" \
93-
"$PROD_PUBLIC_ORIGIN"
73+
"$PROD_TELEGRAM_BOT_TOKEN"

scripts/deploy-prod.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ if [[ $# -lt 6 ]]; then
66
exit 1
77
fi
88

9-
SSH_USER="$1"
10-
SSH_HOST="$2"
11-
SSH_PASSWORD="$3"
12-
TELEGRAM_BOT_TOKEN="$4"
13-
TELEGRAM_BOT_USERNAME="$5"
14-
TELEGRAM_MINI_APP_SHORT_NAME="$6"
9+
SSH_PASSWORD="$1"
10+
TELEGRAM_BOT_TOKEN="$2"
11+
SSH_HOST="${3-spawn-dock.w3voice.net}"
12+
SSH_USER="${4:-ops}"
13+
TELEGRAM_BOT_USERNAME="${5-TMASpawnerBot}"
14+
TELEGRAM_MINI_APP_SHORT_NAME="${6-tma}"
1515
PUBLIC_ORIGIN="${7:-https://spawn-dock.w3voice.net}"
1616
TARGET_DIR="/srv/spawndock-api"
1717
BOT_SECRET="$(openssl rand -hex 24)"

0 commit comments

Comments
 (0)