From 7a3fbe6b4e844590bf198552297cc83f9681648a Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Sat, 15 Feb 2025 01:57:03 +0900 Subject: [PATCH 01/10] Chore: Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8aa337..62ea744 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@   ## ๐Ÿ›  Backend Architecture

- image + image

  From fda1344288a5f48e8beb3c13ffff9671832b793b Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Sun, 16 Feb 2025 12:15:35 +0900 Subject: [PATCH 02/10] =?UTF-8?q?CI:=20=EB=B0=B0=ED=8F=AC=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/backend/farmon/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/backend/farmon/controller/TestController.java b/src/main/java/com/backend/farmon/controller/TestController.java index 8fb898e..55fa39b 100644 --- a/src/main/java/com/backend/farmon/controller/TestController.java +++ b/src/main/java/com/backend/farmon/controller/TestController.java @@ -23,7 +23,7 @@ public class TestController { @GetMapping("/test") public String test(){ - return "Hello World!"; + return "Hello World"; } @GetMapping("/test-redis/set") From 40301995bf61921d8449d14e49154bf086037891 Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Sun, 16 Feb 2025 12:40:51 +0900 Subject: [PATCH 03/10] =?UTF-8?q?CI:=20=EB=A9=94=EB=AA=A8=EB=A6=AC=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EC=9D=B8?= =?UTF-8?q?=EC=8A=A4=ED=84=B4=EC=8A=A4=20=ED=83=80=EC=9E=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=9B=84=20=EB=B0=B0=ED=8F=AC=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/backend/farmon/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/backend/farmon/controller/TestController.java b/src/main/java/com/backend/farmon/controller/TestController.java index 55fa39b..8fb898e 100644 --- a/src/main/java/com/backend/farmon/controller/TestController.java +++ b/src/main/java/com/backend/farmon/controller/TestController.java @@ -23,7 +23,7 @@ public class TestController { @GetMapping("/test") public String test(){ - return "Hello World"; + return "Hello World!"; } @GetMapping("/test-redis/set") From 56eb97628a37964db5914eb802a1697f193f624e Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:01:12 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[#182]=20CI:=20https=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 7 ++----- src/main/java/com/backend/farmon/config/SwaggerConfig.java | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nginx.conf b/nginx.conf index 113d86d..1f6cc81 100644 --- a/nginx.conf +++ b/nginx.conf @@ -7,11 +7,8 @@ http { 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; + listen 443 ssl; + server_name farmon-be.site; # ์ผ๋ฐ˜ API ์š”์ฒญ ์ฒ˜๋ฆฌ (Spring Boot ํ”„๋ก์‹œ) location / { diff --git a/src/main/java/com/backend/farmon/config/SwaggerConfig.java b/src/main/java/com/backend/farmon/config/SwaggerConfig.java index 2a8e2e6..55505f7 100644 --- a/src/main/java/com/backend/farmon/config/SwaggerConfig.java +++ b/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); From 451f31437e3595a16fd28a93bffae7d7332653ec Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:26:04 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[#182]=20CI:=20nginx.conf=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nginx.conf b/nginx.conf index 1f6cc81..aaf7d11 100644 --- a/nginx.conf +++ b/nginx.conf @@ -5,12 +5,11 @@ http { server spring-app:8080; # Spring Boot ์ปจํ…Œ์ด๋„ˆ } + # HTTP ์š”์ฒญ์„ ALB์—์„œ ๋ฐ›์€ ํ›„ ์ฒ˜๋ฆฌ server { listen 80; - listen 443 ssl; server_name farmon-be.site; - # ์ผ๋ฐ˜ API ์š”์ฒญ ์ฒ˜๋ฆฌ (Spring Boot ํ”„๋ก์‹œ) location / { proxy_pass http://spring-server; proxy_set_header X-Real-IP $remote_addr; @@ -18,7 +17,7 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - # WebSocket ์š”์ฒญ ์ฒ˜๋ฆฌ (/ws-stomp ๊ฒฝ๋กœ) + # WebSocket ์š”์ฒญ ์ฒ˜๋ฆฌ location /ws-stomp { proxy_pass http://spring-server; proxy_http_version 1.1; From 628fdedf82d7fd9171a37648b83296f7ba2395a2 Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:29:12 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[#182]=20CI:=20Cors=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=97=90=20=EC=84=9C=EB=B2=84=20https=20=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20nginx.con?= =?UTF-8?q?f=20=ED=8C=8C=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 1 + src/main/java/com/backend/farmon/config/WebConfig.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index aaf7d11..c6fec5c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -15,6 +15,7 @@ http { 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 ์š”์ฒญ ์ฒ˜๋ฆฌ diff --git a/src/main/java/com/backend/farmon/config/WebConfig.java b/src/main/java/com/backend/farmon/config/WebConfig.java index d0f5377..c0bd165 100644 --- a/src/main/java/com/backend/farmon/config/WebConfig.java +++ b/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 ๋ฉ”์„œ๋“œ ๋ช…์‹œ From 5d214c31aaca7d0dca79e418877d26e78dd4ca85 Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:33:10 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[#182]=20CI:=20nginx=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=97=90=20http=20->=20https=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EB=A0=89=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index c6fec5c..6989cc2 100644 --- a/nginx.conf +++ b/nginx.conf @@ -5,7 +5,25 @@ http { server spring-app:8080; # Spring Boot ์ปจํ…Œ์ด๋„ˆ } - # HTTP ์š”์ฒญ์„ ALB์—์„œ ๋ฐ›์€ ํ›„ ์ฒ˜๋ฆฌ + # HTTP ์š”์ฒญ์„ HTTPS๋กœ ๊ฐ•์ œ ๋ฆฌ๋””๋ ‰์…˜ (ALB์—์„œ ์ง์ ‘ HTTP ์š”์ฒญ์„ ํ—ˆ์šฉํ•˜๋Š” ๊ฒฝ์šฐ) + server { + listen 80; + server_name farmon-be.site; + + # ALB Health Check๋ฅผ ์œ„ํ•œ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ + location /actuator/health { + 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; + } + + # HTTP ์š”์ฒญ์„ HTTPS๋กœ ๋ฆฌ๋””๋ ‰์…˜ + return 301 https://$host$request_uri; + } + + # ์‹ค์ œ ์š”์ฒญ์„ ์ฒ˜๋ฆฌํ•˜๋Š” ์„œ๋ฒ„ ๋ธ”๋ก server { listen 80; server_name farmon-be.site; @@ -27,4 +45,4 @@ http { proxy_set_header Host $host; } } -} \ No newline at end of file +} From 8f73a3229b104d9659e3ae8ee049f3b26eb794cd Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:40:39 +0900 Subject: [PATCH 08/10] [#182] CI: delpoy trigger --- .github/workflows/dev-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index d30c103..a9a3188 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.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 From 2f21fda9bebfcf98c723cbc132af6c4abfa5bf4d Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:46:26 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[#182]=20CI:=20nginx=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=97=90=20http=20->=20https=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EB=A0=89=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/nginx.conf b/nginx.conf index 6989cc2..4bd9c24 100644 --- a/nginx.conf +++ b/nginx.conf @@ -5,12 +5,12 @@ http { server spring-app:8080; # Spring Boot ์ปจํ…Œ์ด๋„ˆ } - # HTTP ์š”์ฒญ์„ HTTPS๋กœ ๊ฐ•์ œ ๋ฆฌ๋””๋ ‰์…˜ (ALB์—์„œ ์ง์ ‘ HTTP ์š”์ฒญ์„ ํ—ˆ์šฉํ•˜๋Š” ๊ฒฝ์šฐ) + # ๋ชจ๋“  HTTP ์š”์ฒญ์„ HTTPS๋กœ ๋ฆฌ๋””๋ ‰์…˜ (ALB์—์„œ ์ง์ ‘ HTTP ์š”์ฒญ์„ ํ—ˆ์šฉํ•˜๋Š” ๊ฒฝ์šฐ) server { listen 80; - server_name farmon-be.site; + server_name farmon-be.site www.farmon-be.site; - # ALB Health Check๋ฅผ ์œ„ํ•œ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ + # ALB Health Check ์˜ˆ์™ธ ์ฒ˜๋ฆฌ location /actuator/health { proxy_pass http://spring-server; proxy_set_header X-Real-IP $remote_addr; @@ -20,20 +20,8 @@ http { } # HTTP ์š”์ฒญ์„ HTTPS๋กœ ๋ฆฌ๋””๋ ‰์…˜ - return 301 https://$host$request_uri; - } - - # ์‹ค์ œ ์š”์ฒญ์„ ์ฒ˜๋ฆฌํ•˜๋Š” ์„œ๋ฒ„ ๋ธ”๋ก - server { - listen 80; - server_name farmon-be.site; - 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; + return 301 https://$host$request_uri; } # WebSocket ์š”์ฒญ ์ฒ˜๋ฆฌ From 2e2ee6044d371f17946a28b191ba2b26ba772f0c Mon Sep 17 00:00:00 2001 From: mmije0ng Date: Thu, 20 Feb 2025 12:48:44 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[#182]=20CI:=20nginx=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nginx.conf b/nginx.conf index 4bd9c24..c6fec5c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -5,13 +5,12 @@ http { server spring-app:8080; # Spring Boot ์ปจํ…Œ์ด๋„ˆ } - # ๋ชจ๋“  HTTP ์š”์ฒญ์„ HTTPS๋กœ ๋ฆฌ๋””๋ ‰์…˜ (ALB์—์„œ ์ง์ ‘ HTTP ์š”์ฒญ์„ ํ—ˆ์šฉํ•˜๋Š” ๊ฒฝ์šฐ) + # HTTP ์š”์ฒญ์„ ALB์—์„œ ๋ฐ›์€ ํ›„ ์ฒ˜๋ฆฌ server { listen 80; - server_name farmon-be.site www.farmon-be.site; + server_name farmon-be.site; - # ALB Health Check ์˜ˆ์™ธ ์ฒ˜๋ฆฌ - location /actuator/health { + location / { proxy_pass http://spring-server; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; @@ -19,11 +18,6 @@ http { proxy_set_header X-Forwarded-Proto $scheme; } - # HTTP ์š”์ฒญ์„ HTTPS๋กœ ๋ฆฌ๋””๋ ‰์…˜ - location / { - return 301 https://$host$request_uri; - } - # WebSocket ์š”์ฒญ ์ฒ˜๋ฆฌ location /ws-stomp { proxy_pass http://spring-server; @@ -33,4 +27,4 @@ http { proxy_set_header Host $host; } } -} +} \ No newline at end of file