diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index e83f9857..9cc81114 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,9 +59,7 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "docker pull prom/prometheus" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v home/ubuntu/docker-compose/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh - + echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh - name: upload to s3 diff --git a/src/main/java/bc1/gream/global/security/WebSecurityConfig.java b/src/main/java/bc1/gream/global/security/WebSecurityConfig.java index 0816f8bb..c4cbe89e 100644 --- a/src/main/java/bc1/gream/global/security/WebSecurityConfig.java +++ b/src/main/java/bc1/gream/global/security/WebSecurityConfig.java @@ -118,6 +118,7 @@ private void settingRequestAuthorization(HttpSecurity http) throws Exception { .requestMatchers(HttpMethod.GET, "/api/admin/**").hasAuthority(UserRole.ADMIN.getAuthority()) // health 체크 .requestMatchers(HttpMethod.GET, "/actuator/**").permitAll() + .requestMatchers(HttpMethod.GET, "/actuator").permitAll() // Swagger .requestMatchers(HttpMethod.GET, "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() // 그 외 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7aa26a1c..3cdc2019 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -54,6 +54,8 @@ cloud: access-key: ${S3_ACCESS_KEY} secret-key: ${S3_SECRET_ACCESS_KEY} + + # OAuth2 oauth2: kakao: @@ -77,5 +79,6 @@ management: # tomcat was 메트릭으로 변경 server: tomcat: + connection-timeout: 1800000 mbeanregistry: enabled: true \ No newline at end of file