Remove SSH ControlMaster connection reuse settings from deploy scripts

Author: ralyodio

.github/workflows/deploy.yml

@@ -37,9 +37,6 @@ jobs:
             HostName 104.36.23.197
             User ubuntu
             Port 2048
-            ControlMaster auto
-            ControlPath ~/.ssh/control-%C
-            ControlPersist 30s
           EOF
           chmod 600 ~/.ssh/config
           
@@ -98,7 +95,7 @@ jobs:
           ./bin/deploy-with-migrations.sh
           
           # Run test script to verify deployment
-          ssh -p 2048 -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s [email protected] "cd $DEPLOY_REMOTE_DIR && chmod +x bin/test-github-actions.sh && ./bin/test-github-actions.sh"
+          ssh -p 2048 [email protected] "cd $DEPLOY_REMOTE_DIR && chmod +x bin/test-github-actions.sh && ./bin/test-github-actions.sh"
         env:
           DEPLOY_REMOTE_HOST: 104.36.23.197
           DEPLOY_REMOTE_PORT: 2048

bin/deploy-with-migrations.sh

@@ -23,8 +23,8 @@ REMOTE_PORT="${DEPLOY_REMOTE_PORT:-2048}"
 REMOTE_USER="${DEPLOY_REMOTE_USER:-ubuntu}"
 REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 
-# Create SSH options with connection reuse
-SSH_OPTS="-p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s"
+# Create SSH options
+SSH_OPTS="-p $REMOTE_PORT"
 
 # Deploy the code first using deploy.sh
 echo -e "${YELLOW}Running deployment script...${NC}"

bin/deploy.sh

@@ -16,10 +16,10 @@ REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 LOCAL_DIR="."
 INSTALL_SERVICE="${INSTALL_SERVICE:-false}"
 
-# Create SSH options with connection reuse
-SSH_OPTS="-p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s"
+# Create SSH options
+SSH_OPTS="-p $REMOTE_PORT"
 SCP_OPTS="-P $REMOTE_PORT"
-RSYNC_OPTS="-e \"ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s\""
+RSYNC_OPTS="-e \"ssh -p $REMOTE_PORT\""
 
 # Set colors for output
 GREEN='\033[0;32m'
@@ -42,10 +42,10 @@ if ssh $SSH_OPTS $REMOTE_USER@$REMOTE_HOST "[ -d $REMOTE_DIR ]"; then
     # Deploy using rsync with .deployignore
     if [ -f .deployignore ]; then
         echo -e "${YELLOW}Using .deployignore file for exclusions...${NC}"
-        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     else
         echo -e "${YELLOW}No .deployignore file found. Excluding node_modules/ by default...${NC}"
-        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     fi
 
     # Check if rsync was successful