Skip to content

Commit d7c670a

Browse files
authored
Merge pull request #2 from NBC-finalProject/chore/1
Chore/1 Period 오타수정 및 SSL 인증서 적용
2 parents 7c1f449 + 675cac4 commit d7c670a

File tree

4 files changed

+32
-10
lines changed

4 files changed

+32
-10
lines changed

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ services:
55
build: .
66
ports:
77
- "5173:80"
8+
volumes:
9+
- /etc/letsencrypt:/etc/letsencrypt:ro #인증서 마운트
10+
networks:
11+
- app-network
812

913
networks:
1014
app-network:

nginx.conf

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
server {
2-
listen 80;
3-
server_name cs25;
4-
root /usr/share/nginx/html;
5-
index index.html;
2+
listen 443 ssl;
3+
server_name cs25.co.kr www.cs25.co.kr;
4+
5+
ssl_certificate /etc/letsencrypt/live/cs25.co.kr/fullchain.pem;
6+
ssl_certificate_key /etc/letsencrypt/live/cs25.co.kr/privkey.pem;
67

78
# React Router를 위한 설정
89
location / {
10+
root /usr/share/nginx/html;
11+
index index.html;
912
try_files $uri $uri/ /index.html;
1013
}
1114

@@ -67,3 +70,9 @@ server {
6770
application/json;
6871

6972
}
73+
74+
server {
75+
listen 80;
76+
server_name cs25.co.kr www.cs25.co.kr;
77+
return 301 https://$host$request_uri;
78+
}

nginx.conf.template

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
server {
2-
listen 80;
3-
server_name cs25;
4-
root /usr/share/nginx/html;
5-
index index.html;
2+
listen 443 ssl;
3+
server_name cs25.co.kr www.cs25.co.kr;
4+
5+
ssl_certificate /etc/letsencrypt/live/cs25.co.kr/fullchain.pem;
6+
ssl_certificate_key /etc/letsencrypt/live/cs25.co.kr/privkey.pem;
67

78
# React Router를 위한 설정
89
location / {
10+
root /usr/share/nginx/html;
11+
index index.html;
912
try_files $uri $uri/ /index.html;
1013
}
1114

@@ -66,4 +69,10 @@ server {
6669
application/javascript
6770
application/json;
6871

72+
}
73+
74+
server {
75+
listen 80;
76+
server_name cs25.co.kr www.cs25.co.kr;
77+
return 301 https://$host$request_uri;
6978
}

src/components/common/SubscriptionModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ const SubscriptionModal: React.FC<SubscriptionModalProps> = ({ isOpen, onClose }
7878

7979
const periods = [
8080
{ id: 'ONE_MONTH', label: '1개월' },
81-
{ id: 'THREE_MONTH', label: '3개월' },
82-
{ id: 'SIX_MONTH', label: '6개월' },
81+
{ id: 'THREE_MONTHS', label: '3개월' },
82+
{ id: 'SIX_MONTHS', label: '6개월' },
8383
{ id: 'ONE_YEAR', label: '1년' }
8484
];
8585

0 commit comments

Comments
 (0)