Skip to content

Commit

Permalink
fix: nginx.conf fix
Browse files Browse the repository at this point in the history
  • Loading branch information
SeungGwan123 committed Dec 1, 2024
1 parent 411f717 commit 5bf72ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 31 deletions.
31 changes: 2 additions & 29 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5bf72ce

Please sign in to comment.