Skip to content

Commit c3e888e

Browse files
Himanshu SharmaHimanshu Sharma
authored andcommitted
fix(deploy): correct nginx config and preserve env variables
1 parent ba796cf commit c3e888e

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

.github/workflows/deploy.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,13 @@ jobs:
108108
# ─── Step 6: Deploy on EC2 ────────────────────────────────────
109109
- name: Deploy on EC2
110110
uses: appleboy/ssh-action@v1.0.3
111+
env:
112+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
111113
with:
112114
host: ${{ secrets.EC2_HOST }}
113115
username: ec2-user
114116
key: ${{ secrets.EC2_SSH_KEY }}
115-
envs: IMAGE_TAG,ECR_REGISTRY
117+
envs: IMAGE_TAG,ECR_REGISTRY,SLACK_WEBHOOK_URL
116118
script: |
117119
CURRENT=$(docker inspect task-manager-app \
118120
--format='{{index .Config.Image}}' 2>/dev/null || echo "none")
@@ -123,6 +125,7 @@ jobs:
123125
124126
cd /home/ec2-user/task-manager
125127
echo "APP_IMAGE=$ECR_REGISTRY/task-manager-api:$IMAGE_TAG" > .env
128+
echo "SLACK_WEBHOOK_URL=$SLACK_WEBHOOK_URL" >> .env
126129
127130
docker pull $ECR_REGISTRY/task-manager-api:$IMAGE_TAG
128131
docker-compose --env-file .env up -d
@@ -132,10 +135,13 @@ jobs:
132135
# ─── Step 7: Health check + automatic rollback ────────────────
133136
- name: Health Check and Rollback if Failed
134137
uses: appleboy/ssh-action@v1.0.3
138+
env:
139+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
135140
with:
136141
host: ${{ secrets.EC2_HOST }}
137142
username: ec2-user
138143
key: ${{ secrets.EC2_SSH_KEY }}
144+
envs: SLACK_WEBHOOK_URL
139145
script: |
140146
STATUS=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:3000/health)
141147
@@ -146,6 +152,7 @@ jobs:
146152
if [ "$PREVIOUS_IMAGE" != "none" ]; then
147153
cd /home/ec2-user/task-manager
148154
echo "APP_IMAGE=$PREVIOUS_IMAGE" > .env
155+
echo "SLACK_WEBHOOK_URL=$SLACK_WEBHOOK_URL" >> .env
149156
docker-compose --env-file .env up -d
150157
echo "ROLLBACK COMPLETE"
151158
fi

nginx/nginx.conf

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
1-
events {
2-
worker_connections 1024;
3-
}
4-
5-
http {
6-
7-
# Rate limit zone
8-
limit_req_zone $binary_remote_addr zone=api:10m rate=5r/s;
1+
# Rate limit zone
2+
limit_req_zone $binary_remote_addr zone=api:10m rate=5r/s;
93

10-
upstream backend {
11-
server task-manager-app:3000;
12-
}
4+
upstream backend {
5+
server task-manager-app:3000;
6+
}
137

14-
server {
15-
listen 80;
16-
server_name _;
8+
server {
9+
listen 80;
10+
server_name _;
1711

18-
location / {
19-
limit_req zone=api burst=10 nodelay;
12+
location / {
13+
limit_req zone=api burst=10 nodelay;
2014

21-
proxy_pass http://backend;
22-
proxy_http_version 1.1;
15+
proxy_pass http://backend;
16+
proxy_http_version 1.1;
2317

24-
proxy_set_header Host $host;
25-
proxy_set_header X-Real-IP $remote_addr;
26-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
27-
proxy_set_header X-Forwarded-Proto $scheme;
28-
}
18+
proxy_set_header Host $host;
19+
proxy_set_header X-Real-IP $remote_addr;
20+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
21+
proxy_set_header X-Forwarded-Proto $scheme;
2922
}
3023
}

0 commit comments

Comments
 (0)