From ef342769d461dfe48d0e981eb534d467721a41f5 Mon Sep 17 00:00:00 2001
From: htlee <htlee@gcsc.co.kr>
Date: Wed, 18 Mar 2026 04:38:25 +0900
Subject: [PATCH] =?UTF-8?q?fix(deploy):=20application-prod.yml=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EB=82=B4=EC=9E=A5=20+=20=EC=99=B8=EB=B6=80=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B0=B8=EC=A1=B0=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- application-prod.yml을 .gitignore에서 제거, 환경변수 참조 방식으로 코드에 포함
- deploy.yml에 DB_PASSWORD secret 추가
- systemd에서 -Dspring.config.additional-location 제거
- 서버 외부 application-prod.yml 의존 해소
---
 .gitea/workflows/deploy.yml                     |  2 ++
 .gitignore                                      |  1 -
 backend/src/main/resources/application-prod.yml | 15 +++++++++++++++
 deploy/kcg-backend.service                      |  1 -
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/resources/application-prod.yml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 67c1678..cd2633e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -52,6 +52,7 @@ jobs:
         env:
           GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
         run: |
           DEPLOY_DIR=/deploy/kcg-backend
           mkdir -p $DEPLOY_DIR/backup
@@ -66,6 +67,7 @@ jobs:
           : > $DEPLOY_DIR/.env
           [ -n "$GOOGLE_CLIENT_ID" ] && echo "GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}" >> $DEPLOY_DIR/.env
           [ -n "$JWT_SECRET" ] && echo "JWT_SECRET=${JWT_SECRET}" >> $DEPLOY_DIR/.env
+          [ -n "$DB_PASSWORD" ] && echo "DB_PASSWORD=${DB_PASSWORD}" >> $DEPLOY_DIR/.env
 
           # JAR 교체 + 재시작 트리거
           cp backend/target/kcg.jar $DEPLOY_DIR/kcg.jar
diff --git a/.gitignore b/.gitignore
index 83d80c2..49616a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ frontend/node_modules/
 backend/target/
 backend/.env
 backend/src/main/resources/application-local.yml
-backend/src/main/resources/application-prod.yml
 
 # === Prediction ===
 prediction/__pycache__/
diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..b62d921
--- /dev/null
+++ b/backend/src/main/resources/application-prod.yml
@@ -0,0 +1,15 @@
+spring:
+  datasource:
+    url: ${DB_URL:jdbc:postgresql://211.208.115.83:5432/kcgdb?currentSchema=kcg,public}
+    username: ${DB_USERNAME:kcg_app}
+    password: ${DB_PASSWORD}
+app:
+  jwt:
+    secret: ${JWT_SECRET}
+    expiration-ms: ${JWT_EXPIRATION_MS:86400000}
+  google:
+    client-id: ${GOOGLE_CLIENT_ID}
+  auth:
+    allowed-domain: ${AUTH_ALLOWED_DOMAIN:gcsc.co.kr}
+  cors:
+    allowed-origins: http://localhost:5173,https://kcg.gc-si.dev
diff --git a/deploy/kcg-backend.service b/deploy/kcg-backend.service
index 3367540..bac0ea8 100644
--- a/deploy/kcg-backend.service
+++ b/deploy/kcg-backend.service
@@ -11,7 +11,6 @@ EnvironmentFile=-/devdata/services/kcg/backend/.env
 ExecStart=/usr/lib/jvm/java-21-openjdk-21.0.10.0.7-1.el9.x86_64/bin/java \
     -Xms2g -Xmx4g \
     -Dspring.profiles.active=prod \
-    -Dspring.config.additional-location=file:/devdata/services/kcg/backend/ \
     -jar /devdata/services/kcg/backend/kcg.jar
 
 Restart=on-failure