Merge branch 'develop/be' into feature/be/#630

woowacourse-teams · Jan 4, 2025 · 537d2f7 · 537d2f7
2 parents ca123ae + 32c16d0
commit 537d2f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/.github/workflows/be-cd-dev.yml b/.github/workflows/be-cd-dev.yml
@@ -21,9 +21,6 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name: Make keystore file
-        run: echo "${{secrets.SSL_KEYSTORE}}" | base64 --decode > ./src/main/resources/keystore.p12
-
       - name: Gradle Caching
         uses: actions/cache@v3
         with:

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -124,12 +124,6 @@ spring:
     hibernate:
       ddl-auto: validate
 
-server:
-  ssl:
-    key-store-type: PKCS12
-    key-store-password: ENC(faQYah2QoIaNVRZD9J6/junPRWkc5gaiAs+mEbxDk+I=)
-    key-store: ENC(7VQCNdI7mXATwc4AiymZoyf3mz9SiskXpLnenpMSFBI=)
-
 security:
   jwt:
     token:
@@ -207,4 +201,4 @@ cloud:
       origin-storage-path: touroot/
 
 loki:
-  loki-url: ENC(FHJkwYBoGIuSifQd/92GjnWRS1nvcil2CPFCcWbTicu4rMe/gyFRYzQeqAMCyPkr)
+  loki-url: ENC(JTagwgNAOqA2l2uOvQQHzQAkmSPLUUDSdloHQp3QIIa9Z9zyTrtcHpdQfwPzjBqC)