diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 7d0ff4ac..9a49a56c 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -25,9 +25,9 @@ jobs: - server: loadbalancer3 host: ${{ vars.LOAD_SSH_HOST_3 }} type: api3 - # - server: loadbalancer4 - # host: ${{ vars.LOAD_SSH_HOST_4 }} - # type: api4 + - server: loadbalancer4 + host: ${{ vars.LOAD_SSH_HOST_4 }} + type: api4 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -105,17 +105,17 @@ jobs: target: /corinee overwrite: true - # - name: Send files to loadbalancer - # if: matrix.type == 'api4' - # uses: appleboy/scp-action@master - # with: - # host: ${{ secrets.LOAD_SSH_HOST_4 }} - # username: ${{ secrets.SSH_USERNAME }} - # password: ${{ secrets.LOAD_SSH_PASSWORD_4 }} - # port: ${{ secrets.SSH_PORT }} - # source: "docker-compose.server.yml,.env" - # target: /corinee - # overwrite: true + - name: Send files to loadbalancer + if: matrix.type == 'api4' + uses: appleboy/scp-action@master + with: + host: ${{ secrets.LOAD_SSH_HOST_4 }} + username: ${{ secrets.SSH_USERNAME }} + password: ${{ secrets.LOAD_SSH_PASSWORD_4 }} + port: ${{ secrets.SSH_PORT }} + source: "docker-compose.server.yml,.env" + target: /corinee + overwrite: true - name: Deploy to main server if: matrix.type == 'full' @@ -174,19 +174,19 @@ jobs: docker-compose -f docker-compose.server.yml down docker-compose -f docker-compose.server.yml up -d - # - name: Deploy to loadbalancer4 - # if: matrix.type == 'api4' - # uses: appleboy/ssh-action@master - # with: - # host: ${{ secrets.LOAD_SSH_HOST_4 }} - # username: ${{ secrets.SSH_USERNAME }} - # password: ${{ secrets.LOAD_SSH_PASSWORD_4 }} - # port: ${{ secrets.SSH_PORT }} - # script: | - # cd /corinee - # docker pull ${{ secrets.DOCKERHUB_USERNAME }}/corinee-server - # docker-compose -f docker-compose.server.yml down - # docker-compose -f docker-compose.server.yml up -d + - name: Deploy to loadbalancer4 + if: matrix.type == 'api4' + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.LOAD_SSH_HOST_4 }} + username: ${{ secrets.SSH_USERNAME }} + password: ${{ secrets.LOAD_SSH_PASSWORD_4 }} + port: ${{ secrets.SSH_PORT }} + script: | + cd /corinee + docker pull ${{ secrets.DOCKERHUB_USERNAME }}/corinee-server + docker-compose -f docker-compose.server.yml down + docker-compose -f docker-compose.server.yml up -d - name: Generate Error Report if: failure() diff --git a/nginx.conf b/nginx.conf index c4f2051d..9d94f579 100644 --- a/nginx.conf +++ b/nginx.conf @@ -8,11 +8,11 @@ http { upstream api_servers { least_conn; - server corinee_server_1:3000; # 메인 서버의 API (docker network 내부 이름 사용) - server 223.130.134.167:3000; # 두 번째 서버의 공인 IP - server 223.130.130.192:3000; - server 211.188.59.137:3000; - # server 211.188.59.126:3000; + server corinee_server_1:3000 weight=4; # 메인 서버의 API (docker network 내부 이름 사용) + server 223.130.134.167:3000 weight=8; # 두 번째 서버의 공인 IP + server 223.130.130.192:3000 weight=8; + server 211.188.59.137:3000 weight=8; + server 211.188.59.126:3000 weight=1; } server {