Merge pull request #183 from Farm-On/ci/cd

👷[CI/CD] 서버 배포 주소에 https 적용

Author: Hanjun2022

.github/workflows/dev-deploy.yml

@@ -94,6 +94,7 @@ jobs:
             # Pull Latest Docker Image
             sudo docker pull "${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}:latest"
             
+            # 환경변수 추가
             echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" > /home/ubuntu/.env
             echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> /home/ubuntu/.env
             echo "DOCKER_REPO=${{ secrets.DOCKER_REPO }}" >> /home/ubuntu/.env

nginx.conf

@@ -5,23 +5,20 @@ http {
         server spring-app:8080;  # Spring Boot 컨테이너
     }
 
+    # HTTP 요청을 ALB에서 받은 후 처리
     server {
         listen 80;
-        # listen 443 ssl;
-       # server_name
-        # SSL 인증서 설정
-#         ssl_certificate /etc/letsencrypt/live/{server_name}/fullchain.pem;
-#         ssl_certificate_key /etc/letsencrypt/live/{server_name}/privkey.pem;
+        server_name farmon-be.site;
 
-        # 일반 API 요청 처리 (Spring Boot 프록시)
         location / {
             proxy_pass http://spring-server;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        # WebSocket 요청 처리 (/ws-stomp 경로)
+        # WebSocket 요청 처리
         location /ws-stomp {
             proxy_pass http://spring-server;
             proxy_http_version 1.1;

src/main/java/com/backend/farmon/config/SwaggerConfig.java

@@ -32,7 +32,8 @@ public OpenAPI FarmONSwagger() {
 
         return new OpenAPI()
                 .addServersItem(new Server().url("http://localhost:8080")) // 로컬 서버 URL 설정
-                .addServersItem(new Server().url("http://43.201.137.131:8080")) // 배포된 서버 URL
+                .addServersItem(new Server().url("https://farmon-be.site")) // 배포된 서버 URL (https)
+                .addServersItem(new Server().url("http://43.201.137.131:8080")) // 배포된 서버 URL (http)
                 .info(info)
                 .addSecurityItem(securityRequirement)
                 .components(components);

src/main/java/com/backend/farmon/config/WebConfig.java

@@ -19,7 +19,7 @@ public class WebConfig implements WebMvcConfigurer {
     public void addCorsMappings(CorsRegistry registry) {
 
         registry.addMapping("/**") // 모든 경로에 대해 CORS 허용
-                .allowedOrigins("http://localhost:5173", "http://localhost:8080", "http://43.201.137.131:8080") // 허용할 Origin 설정
+                .allowedOrigins("http://localhost:5173", "http://localhost:8080", "https://farmon-be.site", "http://43.201.137.131:8080") // 허용할 Origin 설정
                 .allowedHeaders("*") // 요청을 허용할 헤더 설정
                 .exposedHeaders("*")  // 응답 헤더 설정
                 .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") // 허용할 HTTP 메서드 명시