Skip to content

Commit

Permalink
Merge pull request #128 from dnd-side-project/develop
Browse files Browse the repository at this point in the history
infra test
  • Loading branch information
HunSeongPark authored Feb 24, 2024
2 parents f684eee + 50c6ff2 commit 6b75cde
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ main ]

env:
S3_BUCKET_NAME: reet-deploy
S3_BUCKET_NAME: reet-place-deploy
PROJECT_NAME: reetplace

jobs:
Expand Down Expand Up @@ -55,4 +55,4 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: aws deploy create-deployment --application-name reet --deployment-group-name reet-group --file-exists-behavior OVERWRITE --s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip --region ap-northeast-2
run: aws deploy create-deployment --application-name reet-place --deployment-group-name reet-place-group --file-exists-behavior OVERWRITE --s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip --region ap-northeast-2
2 changes: 1 addition & 1 deletion scripts/switch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else
exit 1
fi

echo "set \$service_url http://3.35.120.26:${TARGET_PORT};" | tee /home/ubuntu/service_url.inc
echo "set \$service_url http://3.38.66.143:${TARGET_PORT};" | tee /home/ubuntu/service_url.inc

echo "> 스위칭 후 Nginx가 프록싱하는 포트 : ${TARGET_PORT}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
.authorizeHttpRequests(auth -> {
auth.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
.mvcMatchers("/swagger-ui/**", "/v3/api-docs/**", "/actuator/**", "/terms/**").permitAll();
.mvcMatchers("/swagger-ui/**", "/v3/api-docs/**", "/actuator/**", "/terms2/**").permitAll();
Arrays.stream(AUTH_WHITE_LIST)
.forEach(authWhiteListElem ->
auth.mvcMatchers(BASE_URL + authWhiteListElem).permitAll());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@Controller
public class TermsController {

@GetMapping("/terms")
@GetMapping("/terms2")
public String terms() {
return "terms";
}
Expand Down

0 comments on commit 6b75cde

Please sign in to comment.