diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 5bec63f4..df05b43f 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -25,9 +25,7 @@ jobs: # - server: loadbalancer3 # host: ${{ vars.LOAD_SSH_HOST_3 }} # type: api3 - # - server: loadbalancer4 - # host: ${{ vars.LOAD_SSH_HOST_4 }} - # type: api4 + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -105,18 +103,6 @@ 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: Deploy to main server if: matrix.type == 'full' uses: appleboy/ssh-action@master @@ -175,20 +161,7 @@ jobs: # docker-compose -f docker-compose.server.yml down # docker-compose -f docker-compose.server.yml up -d # docker image prune -f - # - 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 - # docker image prune -f + - name: Generate Error Report if: failure() run: | diff --git a/nginx.conf b/nginx.conf index 1593d10b..455a5a31 100644 --- a/nginx.conf +++ b/nginx.conf @@ -12,8 +12,7 @@ http { # server 223.130.134.167:3000 weight=8 max_fails=3 fail_timeout=30s; # server 223.130.130.192:3000 weight=8 max_fails=3 fail_timeout=30s; # server 211.188.59.137:3000 weight=8 max_fails=3 fail_timeout=30s; - # server 211.188.59.126:3000 weight=1 max_fails=3 fail_timeout=30s; - # server 124.28.132.80:7999 weight=80 max_fails=3 fail_timeout=30s; + keepalive 300; keepalive_requests 1000; keepalive_timeout 75s;