From 7ec068a1b3082ac24a95be09431d024148d23b86 Mon Sep 17 00:00:00 2001
From: LeeMyeongJin <dlaudwls1203@gmail.com>
Date: Tue, 24 Feb 2026 08:17:07 +0900
Subject: [PATCH 1/3] =?UTF-8?q?chore:=20EC2=20=EB=A6=AC=EB=B6=80=ED=8A=B8?=
 =?UTF-8?q?=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(=EC=9E=84=EC=8B=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ec2-reboot.yml | 77 ++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 .github/workflows/ec2-reboot.yml

diff --git a/.github/workflows/ec2-reboot.yml b/.github/workflows/ec2-reboot.yml
new file mode 100644
index 0000000..8326da4
--- /dev/null
+++ b/.github/workflows/ec2-reboot.yml
@@ -0,0 +1,77 @@
+name: EC2-REBOOT
+
+on:
+  workflow_dispatch:
+
+jobs:
+  reboot:
+    name: Reboot EC2 Instance
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_PROD_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_PROD_SECRET_KEY }}
+        aws-region: ap-northeast-2
+
+    - name: Find EC2 instance
+      id: find-ec2
+      run: |
+        echo "=== 모든 EC2 인스턴스 조회 ==="
+        aws ec2 describe-instances \
+          --query "Reservations[].Instances[].[InstanceId, PublicIpAddress, State.Name, Tags[?Key=='Name'].Value | [0]]" \
+          --output table
+
+        echo ""
+        echo "=== Public IP 3.35.195.11 으로 검색 ==="
+        INSTANCE_ID=$(aws ec2 describe-instances \
+          --filters "Name=ip-address,Values=3.35.195.11" \
+          --query "Reservations[].Instances[].InstanceId" \
+          --output text)
+
+        if [ -z "$INSTANCE_ID" ]; then
+          echo "Public IP로 찾지 못함. 실행 중인 모든 인스턴스 확인..."
+          INSTANCE_ID=$(aws ec2 describe-instances \
+            --filters "Name=instance-state-name,Values=running,stopped" \
+            --query "Reservations[].Instances[].InstanceId" \
+            --output text)
+        fi
+
+        echo "INSTANCE_ID=$INSTANCE_ID" >> $GITHUB_OUTPUT
+        echo "찾은 Instance ID: $INSTANCE_ID"
+
+    - name: Reboot EC2 instance
+      run: |
+        INSTANCE_ID="${{ steps.find-ec2.outputs.INSTANCE_ID }}"
+        if [ -n "$INSTANCE_ID" ]; then
+          echo "EC2 리부트 시작: $INSTANCE_ID"
+          aws ec2 reboot-instances --instance-ids $INSTANCE_ID
+          echo "리부트 명령 전송 완료!"
+
+          echo "60초 대기 후 상태 확인..."
+          sleep 60
+
+          aws ec2 describe-instances \
+            --instance-ids $INSTANCE_ID \
+            --query "Reservations[].Instances[].[InstanceId, PublicIpAddress, State.Name]" \
+            --output table
+        else
+          echo "ERROR: 인스턴스를 찾을 수 없습니다!"
+          exit 1
+        fi
+
+    - name: Health check
+      run: |
+        echo "서버 헬스 체크 시작 (최대 3분 대기)..."
+        for i in $(seq 1 18); do
+          HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --connect-timeout 5 --max-time 10 http://3.35.195.11/actuator/health 2>/dev/null || echo "000")
+          echo "[$i/18] HTTP: $HTTP_CODE"
+          if [ "$HTTP_CODE" = "200" ]; then
+            echo "서버 복구 완료!"
+            exit 0
+          fi
+          sleep 10
+        done
+        echo "WARNING: 서버가 아직 응답하지 않습니다. EC2는 리부트되었지만 앱 시작에 시간이 더 필요할 수 있습니다."

From 59f62aca17009cd44315b9a4fbadcd7b254a1904 Mon Sep 17 00:00:00 2001
From: LeeMyeongJin <dlaudwls1203@gmail.com>
Date: Tue, 24 Feb 2026 08:18:34 +0900
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20EC2=20=EB=B3=B5=EA=B5=AC=20?=
 =?UTF-8?q?=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20-=20CodeDeploy?=
 =?UTF-8?q?=20=EC=9E=AC=EB=B0=B0=ED=8F=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ec2-reboot.yml | 106 +++++++++++++++++++------------
 1 file changed, 64 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/ec2-reboot.yml b/.github/workflows/ec2-reboot.yml
index 8326da4..ce0067b 100644
--- a/.github/workflows/ec2-reboot.yml
+++ b/.github/workflows/ec2-reboot.yml
@@ -1,11 +1,11 @@
-name: EC2-REBOOT
+name: EC2-RECOVERY
 
 on:
   workflow_dispatch:
 
 jobs:
-  reboot:
-    name: Reboot EC2 Instance
+  recover:
+    name: Recover Server
     runs-on: ubuntu-latest
 
     steps:
@@ -16,55 +16,70 @@ jobs:
         aws-secret-access-key: ${{ secrets.AWS_PROD_SECRET_KEY }}
         aws-region: ap-northeast-2
 
-    - name: Find EC2 instance
-      id: find-ec2
+    - name: Check IAM identity
       run: |
-        echo "=== 모든 EC2 인스턴스 조회 ==="
-        aws ec2 describe-instances \
-          --query "Reservations[].Instances[].[InstanceId, PublicIpAddress, State.Name, Tags[?Key=='Name'].Value | [0]]" \
-          --output table
+        echo "=== IAM 정보 확인 ==="
+        aws sts get-caller-identity || echo "STS 호출 실패"
 
-        echo ""
-        echo "=== Public IP 3.35.195.11 으로 검색 ==="
-        INSTANCE_ID=$(aws ec2 describe-instances \
-          --filters "Name=ip-address,Values=3.35.195.11" \
-          --query "Reservations[].Instances[].InstanceId" \
-          --output text)
+    - name: Check CodeDeploy deployments
+      run: |
+        echo "=== 최근 배포 상태 확인 ==="
+        aws deploy list-deployments \
+          --application-name runnect-prod-codedeploy \
+          --deployment-group-name runnect-prod-codedeploy-group \
+          --include-only-statuses "Succeeded,Failed,InProgress" \
+          --query "deployments[:3]" \
+          --output text || echo "배포 목록 조회 실패"
 
-        if [ -z "$INSTANCE_ID" ]; then
-          echo "Public IP로 찾지 못함. 실행 중인 모든 인스턴스 확인..."
-          INSTANCE_ID=$(aws ec2 describe-instances \
-            --filters "Name=instance-state-name,Values=running,stopped" \
-            --query "Reservations[].Instances[].InstanceId" \
-            --output text)
-        fi
+        LATEST=$(aws deploy list-deployments \
+          --application-name runnect-prod-codedeploy \
+          --deployment-group-name runnect-prod-codedeploy-group \
+          --query "deployments[0]" \
+          --output text 2>/dev/null)
 
-        echo "INSTANCE_ID=$INSTANCE_ID" >> $GITHUB_OUTPUT
-        echo "찾은 Instance ID: $INSTANCE_ID"
+        if [ -n "$LATEST" ] && [ "$LATEST" != "None" ]; then
+          echo ""
+          echo "=== 최신 배포 상세 ==="
+          aws deploy get-deployment --deployment-id "$LATEST" \
+            --query "deploymentInfo.{status:status, createTime:createTime, completeTime:completeTime, errorInfo:errorInformation}" \
+            --output json
+        fi
 
-    - name: Reboot EC2 instance
+    - name: Trigger new CodeDeploy deployment
       run: |
-        INSTANCE_ID="${{ steps.find-ec2.outputs.INSTANCE_ID }}"
-        if [ -n "$INSTANCE_ID" ]; then
-          echo "EC2 리부트 시작: $INSTANCE_ID"
-          aws ec2 reboot-instances --instance-ids $INSTANCE_ID
-          echo "리부트 명령 전송 완료!"
+        echo "=== 새 CodeDeploy 배포 트리거 ==="
+        DEPLOYMENT_ID=$(aws deploy create-deployment \
+          --application-name runnect-prod-codedeploy \
+          --deployment-group-name runnect-prod-codedeploy-group \
+          --file-exists-behavior OVERWRITE \
+          --s3-location bucket=runnect-prod-bucket,bundleType=zip,key=runnect_prod_server.zip \
+          --region ap-northeast-2 \
+          --query "deploymentId" \
+          --output text)
 
-          echo "60초 대기 후 상태 확인..."
-          sleep 60
+        echo "Deployment ID: $DEPLOYMENT_ID"
 
-          aws ec2 describe-instances \
-            --instance-ids $INSTANCE_ID \
-            --query "Reservations[].Instances[].[InstanceId, PublicIpAddress, State.Name]" \
-            --output table
-        else
-          echo "ERROR: 인스턴스를 찾을 수 없습니다!"
-          exit 1
-        fi
+        echo "배포 완료 대기 (최대 5분)..."
+        for i in $(seq 1 30); do
+          STATUS=$(aws deploy get-deployment --deployment-id "$DEPLOYMENT_ID" \
+            --query "deploymentInfo.status" --output text 2>/dev/null)
+          echo "[$i/30] Status: $STATUS"
+
+          if [ "$STATUS" = "Succeeded" ]; then
+            echo "배포 성공!"
+            break
+          elif [ "$STATUS" = "Failed" ] || [ "$STATUS" = "Stopped" ]; then
+            echo "배포 실패! 상세 정보:"
+            aws deploy get-deployment --deployment-id "$DEPLOYMENT_ID" \
+              --query "deploymentInfo.errorInformation" --output json
+            break
+          fi
+          sleep 10
+        done
 
     - name: Health check
       run: |
-        echo "서버 헬스 체크 시작 (최대 3분 대기)..."
+        echo "서버 헬스 체크 (최대 3분 대기)..."
         for i in $(seq 1 18); do
           HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --connect-timeout 5 --max-time 10 http://3.35.195.11/actuator/health 2>/dev/null || echo "000")
           echo "[$i/18] HTTP: $HTTP_CODE"
@@ -74,4 +89,11 @@ jobs:
           fi
           sleep 10
         done
-        echo "WARNING: 서버가 아직 응답하지 않습니다. EC2는 리부트되었지만 앱 시작에 시간이 더 필요할 수 있습니다."
+
+        echo ""
+        echo "=== 포트별 체크 ==="
+        for PORT in 80 8081 8082; do
+          HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --connect-timeout 5 --max-time 10 http://3.35.195.11:$PORT/actuator/health 2>/dev/null || echo "000")
+          echo "Port $PORT: HTTP $HTTP_CODE"
+        done
+        echo "WARNING: 서버가 아직 응답하지 않습니다."

From e11a7c72e03c6d4179c1718100e8ae3ab52579b0 Mon Sep 17 00:00:00 2001
From: LeeMyeongJin <dlaudwls1203@gmail.com>
Date: Tue, 24 Feb 2026 08:26:41 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20deploy.sh=20Nginx=20=EC=9E=90?=
 =?UTF-8?q?=EB=8F=99=20=EC=9E=AC=EC=8B=9C=EC=9E=91=20+=20=EC=A7=84?=
 =?UTF-8?q?=EB=8B=A8=20=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/deploy.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index cec838a..c53ea7a 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -77,6 +77,28 @@ do
   sleep 10
 done
 
+echo "> Nginx 상태 확인"
+if ! sudo systemctl is-active --quiet nginx; then
+  echo "> Nginx가 중지되어 있습니다. 재시작합니다."
+  sudo systemctl start nginx
+  sleep 2
+  if sudo systemctl is-active --quiet nginx; then
+    echo "> Nginx 재시작 성공"
+  else
+    echo "> Nginx 재시작 실패. 상태:"
+    sudo systemctl status nginx
+  fi
+else
+  echo "> Nginx 정상 구동 중"
+fi
+
 echo "> 스위칭"
 sleep 10
 /home/ubuntu/app/nonstop/switch.sh
+
+echo "> 배포 완료. 최종 상태 확인"
+echo "> Nginx: $(sudo systemctl is-active nginx)"
+echo "> Java 프로세스:"
+pgrep -a java || echo "> Java 프로세스 없음"
+echo "> 포트 리스닝:"
+sudo ss -tlnp | grep -E ':(80|8081|8082) ' || echo "> 해당 포트 리스닝 없음"