manawenuz/featherChat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use public HTTPS git URLs, remove SSH key upload

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Siavash Sameni
2026-03-30 11:53:25 +04:00
parent 9af5ec96b5
commit cc76004655
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
warzone/scripts/deploy-chat.sh
View File

@@ -25,9 +25,9 @@ REMOTE_USER="root"
DOMAIN="chat.manko.yoga"
CF_ZONE="manko.yoga"
# Git repos (public)
GIT_FC="ssh://git@git.manko.yoga:222/manawenuz/featherChat.git"
GIT_WZP="ssh://git@git.manko.yoga:222/manawenuz/wz-phone.git"
# Git repos (public, HTTP)
GIT_FC="https://git.manko.yoga/manawenuz/featherChat.git"
GIT_WZP="https://git.manko.yoga/manawenuz/wz-phone.git"
GIT_BRANCH="feature/call-ring-group"
DEPLOY_DIR="/root/featherChat"
@@ -172,23 +172,18 @@ do_deploy() {
cf_token=$(get_cf_token)
[ -z "$ip" ] && { echo "ERROR: No VM." >&2; exit 1; }
echo "[1/5] Uploading SSH key for git access..."
scp $SSH_OPTS -i "$SSH_KEY_PATH" "$SSH_KEY_PATH" "$REMOTE_USER@$ip:/root/.ssh/id_ed25519"
scp $SSH_OPTS -i "$SSH_KEY_PATH" "${SSH_KEY_PATH}.pub" "$REMOTE_USER@$ip:/root/.ssh/id_ed25519.pub"
ssh_cmd "chmod 600 /root/.ssh/id_ed25519"
echo "[2/5] Cloning repos on VPS..."
echo "[1/4] Cloning repos on VPS..."
ssh_cmd "rm -rf $DEPLOY_DIR && \
GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no -p 222' git clone --depth 1 -b $GIT_BRANCH $GIT_FC $DEPLOY_DIR && \
GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no -p 222' git clone --depth 1 $GIT_WZP $DEPLOY_DIR/warzone-phone"
git clone --depth 1 -b $GIT_BRANCH $GIT_FC $DEPLOY_DIR && \
git clone --depth 1 $GIT_WZP $DEPLOY_DIR/warzone-phone"
echo "[3/5] Updating Caddyfile domain..."
echo "[2/4] Updating Caddyfile domain..."
ssh_cmd "sed -i 's/voip.manko.yoga/$DOMAIN/g' $DOCKER_DIR/Caddyfile"
echo "[4/5] Setting up CF token..."
echo "[3/4] Setting up CF token..."
ssh_cmd "echo '$cf_token' > $DOCKER_DIR/cf_api_token.txt && chmod 600 $DOCKER_DIR/cf_api_token.txt"
echo "[5/5] Building + starting stack (takes a few minutes on first run)..."
echo "[4/4] Building + starting stack (takes a few minutes on first run)..."
ssh_cmd "cd $DOCKER_DIR && \
sed -i 's|voip.manko.yoga/audio|$DOMAIN/audio|g' docker-compose.yml && \
docker compose up -d --build 2>&1" | tail -30
@@ -209,8 +204,8 @@ do_redeploy() {
[ -z "$ip" ] && { echo "ERROR: No VM." >&2; exit 1; }
echo "[1/2] Pulling latest..."
ssh_cmd "cd $DEPLOY_DIR && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no -p 222' git pull && \
cd $DEPLOY_DIR/warzone-phone && GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no -p 222' git pull"
ssh_cmd "cd $DEPLOY_DIR && git pull && \
cd $DEPLOY_DIR/warzone-phone && git pull"
echo "[2/2] Rebuilding..."
ssh_cmd "cd $DOCKER_DIR && \