Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ DEPLOY_PATH=$BASE_PATH/jar/
cp $BUILD_PATH $DEPLOY_PATH

echo "> 현재 구동중인 Set 확인" >> /home/ec2-user/deploy.log
CURRENT_PROFILE=$(curl -s https://feedb.shop/nginx/profile)
CURRENT_PROFILE=$(curl -s https://feedb.store/nginx/profile)
echo "> $CURRENT_PROFILE" >> /home/ec2-user/deploy.log

# 쉬고 있는 set 찾기: set1이 사용중이면 set2가 쉬고 있고 , 반대면 set1이 쉬고 있음
Expand Down
4 changes: 2 additions & 2 deletions scripts/switch.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
echo "> ============ switch.sh 실행 (nignx 동적 프록시 설정) ==============" >> /home/ec2-user/deploy.log
echo "> 현재 구동중인 Port 확인" >> /home/ec2-user/deploy.log
CURRENT_PROFILE=$(curl -s https://feedb.shop/nginx/profile)
CURRENT_PROFILE=$(curl -s https://feedb.store/nginx/profile)

# 쉬고 있는 set 찾기: set1이 사용중이면 set2가 쉬고 있고, 반대면 set1이 쉬고 있음
if [ $CURRENT_PROFILE == set1 ]
Expand All @@ -19,7 +19,7 @@ echo "> 전환할 Port: $IDLE_PORT" >> /home/ec2-user/deploy.log
echo "> Port 전환" >> /home/ec2-user/deploy.log
echo "set \$service_url http://127.0.0.1:${IDLE_PORT};" |sudo tee /etc/nginx/conf.d/service-url.inc

PROXY_PORT=$(curl -s https://feedb.shop/nginx/profile)
PROXY_PORT=$(curl -s https://feedb.store/nginx/profile)
echo "> Nginx Current Proxy Port: $PROXY_PORT" >> /home/ec2-user/deploy.log

echo "> Nginx Reload" >> /home/ec2-user/deploy.log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@Configuration
@OpenAPIDefinition(info = @Info(version = "1.0"),
servers = {@Server(url = "https://feedb.shop", description = "HTTPS Server"),
servers = {@Server(url = "https://feedb.store", description = "HTTPS Server"),
@Server(url = "http://localhost:8080", description = "Local Development server(백엔드 개발용)")})

@SecurityScheme(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();
// TODO : 도메인 설정 완료 시 변경 할 것
configuration.setAllowedHeaders(List.of("*"));
configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://feedb.vercel.app" , "https://feedb.shop"));
configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://feedb.vercel.app" , "https://feedb.store"));
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
configuration.setExposedHeaders(List.of("*"));
configuration.setAllowCredentials(true);
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ spring:
client:
registration:
naver:
client-id: moMQFUSHmEQLJ24OlDhj
client-secret: HupMrYC8yt #TODO 외부 노출 방지 필요
client-id: PRkVouR_ApYaBb4gie9c
client-secret: BgKCW4JtK3 #TODO 외부 노출 방지 필요
redirect-uri: http://localhost:8080/login/oauth2/code/naver #고정값(운영일 때 profile에 맞춰 변경)
authorization-grant-type: authorization_code
scope: name , email
client-name: Naver
kakao:
client-id: 1e8cf90e4a41d3250b08438a95b69f98
client-id: bd9657b9f9347732e4f6bf1eb2e62c4d
redirect-uri: http://localhost:8080/login/oauth2/code/kakao #고정값(운영일 때 profile에 맞춰 변경)
authorization-grant-type: authorization_code
scope: profile_nickname , account_email #profile_nickname
Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/nginx-set.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://feedb-db.cjos0aaae8c0.ap-northeast-2.rds.amazonaws.com:3306/feedb_db?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true
username: feedB_user
password: feedb_codeit
username: admin
password: GUP4jLy1bBKzdwOSENVU
jpa:
hibernate:
ddl-auto: update
Expand All @@ -21,9 +21,9 @@ spring:
client:
registration:
naver:
redirect-uri: https://feedb.shop/login/oauth2/code/naver
redirect-uri: https://feedb.store/login/oauth2/code/naver
kakao:
redirect-uri: https://feedb.shop/login/oauth2/code/kakao
redirect-uri: https://feedb.store/login/oauth2/code/kakao
server:
port: 8081

Expand All @@ -35,8 +35,8 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://feedb-db.cjos0aaae8c0.ap-northeast-2.rds.amazonaws.com:3306/feedb_db?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true
username: feedB_user
password: feedb_codeit
username: admin
password: GUP4jLy1bBKzdwOSENVU
jpa:
hibernate:
ddl-auto: update
Expand All @@ -49,8 +49,8 @@ spring:
client:
registration:
naver:
redirect-uri: https://feedb.shop/login/oauth2/code/naver
redirect-uri: https://feedb.store/login/oauth2/code/naver
kakao:
redirect-uri: https://feedb.shop/login/oauth2/code/kakao
redirect-uri: https://feedb.store/login/oauth2/code/kakao
server:
port: 8082