From 7ea6160df39dd5c1e1557fc6b3de947113170ce4 Mon Sep 17 00:00:00 2001
From: RetepMil <lkslyj2@naver.com>
Date: Fri, 13 Oct 2023 22:10:25 +0900
Subject: [PATCH] =?UTF-8?q?:wrench:=20application.yml=20=EC=88=A8=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cicd.yml         | 25 +++++++++++-----
 .gitignore                         |  1 +
 src/main/resources/application.yml | 47 ------------------------------
 3 files changed, 18 insertions(+), 55 deletions(-)
 delete mode 100644 src/main/resources/application.yml

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 25edcf0..731d4d6 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -35,14 +35,23 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-#      - name: Make 'application.yml'
-#        if: contains(github.ref, 'develop')
-#        run: |
-#          cd ./src/main/resources
-#          touch ./application.yml
-#          echo "${{ secrets.APPLICATION_YML_DEV }}" > ./application.yml
-#          cat ./application.yml
-#        shell: bash
+      - name: Make 'application.yml'
+        if: contains(github.ref, 'develop')
+        run: |
+          cd ./src/main/resources
+          touch ./application.yml
+          echo "${{ secrets.APPLICATION_YML_DEV }}" | base64 --decode > ./application.yml
+          cat ./application.yml
+        shell: bash
+
+      - name: Make 'application.yml'
+        if: contains(github.ref, 'main')
+        run: |
+          cd ./src/main/resources
+          touch ./application.yml
+          echo "${{ secrets.APPLICATION_YML }}" | base64 --decode > ./application.yml
+          cat ./application.yml
+        shell: bash
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
diff --git a/.gitignore b/.gitignore
index 4ccc24f..8e49e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+application.yml
 
 ### IntelliJ IDEA ###
 .idea
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
deleted file mode 100644
index dd9e6af..0000000
--- a/src/main/resources/application.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-spring:
-  jpa:
-    hibernate:
-      ddl-auto: update
-    properties:
-      hibernate:
-        format_sql: true
-        highlight_sql: true
-    database: postgresql
-    open-in-view: true
-  datasource:
-    hikari:
-      maximum-pool-size: 4
-    url: jdbc:postgresql://daily-steady-db.clgq6c3hfkhr.ap-southeast-2.rds.amazonaws.com:5432/dev
-    username: postgres
-    password: 12345678
-    driver-class-name: org.postgresql.Driver
-  sql:
-    init:
-      mode: always
-
-server:
-  port: 9000
-  ssl:
-    key-store: classpath:keystore.p12
-    key-store-type: PKCS12
-    key-store-password: 1234
-  servlet:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  error:
-    include-message: always
-
-logging:
-  pattern:
-    console: "[%d{HH:mm:ss.SSS}][%-5level][%logger.%method:line%line] - %msg%n"
-  level:
-    org:
-      hibernate:
-        SQL: debug
-        type.descriptor.sql: trace
-    retepmil.personal.dailysteady: debug
-
-jwt:
-  secret: d8e3b829ff785f3465143d93993a36790d569231e969b0aa70a01b437fb7c844
\ No newline at end of file