Skip to content

Commit 84f2f68

Browse files
committed
Merge branch 'test-prod-fe' into prod-fe
2 parents db63848 + 2eb1fbe commit 84f2f68

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

.github/workflows/prod-fe-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and Push Docker Image
33
on:
44
push:
55
branches:
6-
- prod-fe
6+
- test-prod-fe
77

88
jobs:
99
build:
@@ -51,6 +51,6 @@ jobs:
5151
mkdir -p ~/.ssh
5252
echo "$SSH_PEM_KEY" > ~/.ssh/SSH_PEM_KEY.pem
5353
chmod 600 ~/.ssh/SSH_PEM_KEY.pem
54-
ssh -p $SSH_PORT -i ~/.ssh/SSH_PEM_KEY.pem -o StrictHostKeyChecking=no [email protected] 'cd prod && bash prod_fe.sh'
54+
ssh -p $SSH_PORT -i ~/.ssh/SSH_PEM_KEY.pem -o StrictHostKeyChecking=no $SSH_USERNAME@test.liboo.kr 'cd prod && bash prod_fe.sh'
5555
5656

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ services:
1414
- "1935:1935"
1515
- "3000:3000"
1616
volumes:
17-
- /etc/letsencrypt/live/liboo.kr:/etc/letsencrypt/live/liboo.kr:ro
18-
- /etc/letsencrypt/archive/liboo.kr:/etc/letsencrypt/archive/liboo.kr:ro
17+
- /etc/letsencrypt/live/test.liboo.kr:/etc/letsencrypt/live/test.liboo.kr:ro
18+
- /etc/letsencrypt/archive/test.liboo.kr:/etc/letsencrypt/archive/test.liboo.kr:ro
1919
- /etc/nginx/ssl/dhparams.pem:/etc/nginx/ssl/dhparams.pem:ro
2020

2121
networks:

fe.build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
build:
77
context: nginx
88
dockerfile: dockerfile
9-
image: liboost/nginx:latest
9+
image: liboost/test-nginx:latest
1010
ports:
1111
- "80:80"
1212
- "443:443"

frontend/src/apis/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { QueryClient, DefaultOptions } from '@tanstack/react-query';
22
import axios from 'axios';
33

4-
export const BASE_URL = 'https://liboo.kr';
4+
export const BASE_URL = 'https://test.liboo.kr';
55
export const RTMP_PORT = '1935';
66
export const RTMP_HTTP_PORT = '8000';
77
export const API_PORT = '3000';

frontend/src/components/host/SettingInfo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ export default function SettingInfo({ closeModal }: SettingInfoProps) {
5757
<SettingRow>
5858
<Label htmlFor="streamUrl">스트림 URL</Label>
5959
<ValueWithButton>
60-
<StreamURL>rtmp://liboo.kr:1935/live</StreamURL>
61-
<CopyButton onClick={() => navigator.clipboard.writeText('rtmp://liboo.kr:1935/live')}>
60+
<StreamURL>rtmp://test.liboo.kr:1935/live</StreamURL>
61+
<CopyButton onClick={() => navigator.clipboard.writeText('rtmp://test.liboo.kr:1935/live')}>
6262
복사
6363
</CopyButton>
6464
</ValueWithButton>

nginx/conf.d/rtmp.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
server {
22
listen 8000 ssl; # HTTPS 8000 포트 수신
3-
server_name liboo.kr;
3+
server_name test.liboo.kr;
44

5-
ssl_certificate "/etc/letsencrypt/live/liboo.kr/fullchain.pem";
5+
ssl_certificate "/etc/letsencrypt/live/test.liboo.kr/fullchain.pem";
66
ssl_protocols TLSv1.2 TLSv1.3;
7-
ssl_certificate_key "/etc/letsencrypt/live/liboo.kr/privkey.pem";
7+
ssl_certificate_key "/etc/letsencrypt/live/test.liboo.kr/privkey.pem";
88
ssl_dhparam "/etc/nginx/ssl/dhparams.pem";
99
add_header Strict-Transport-Security "max-age=31536000";
1010

nginx/conf.d/ssl.conf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ server {
55
# listen [::]:443 ssl http2 default_server;
66
client_max_body_size 10M;
77

8-
ssl_certificate "/etc/letsencrypt/live/liboo.kr/fullchain.pem";
8+
ssl_certificate "/etc/letsencrypt/live/test.liboo.kr/fullchain.pem";
99
ssl_protocols TLSv1.2 TLSv1.3;
10-
ssl_certificate_key "/etc/letsencrypt/live/liboo.kr/privkey.pem";
10+
ssl_certificate_key "/etc/letsencrypt/live/test.liboo.kr/privkey.pem";
1111
ssl_dhparam "/etc/nginx/ssl/dhparams.pem";
1212
add_header Strict-Transport-Security "max-age=31536000";
13-
server_name liboo.kr;
13+
server_name test.liboo.kr;
14+
15+
root /usr/share/nginx/html;
16+
index index.html;
1417

1518
root /usr/share/nginx/html;
1619
index index.html;

0 commit comments

Comments
 (0)