Skip to content

Commit

Permalink
Merge pull request #92 from wafflestudio/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
yeonsumia authored Aug 16, 2022
2 parents 0252ce9 + e22c96c commit ddd98aa
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ out/

### Application Account ###
src/main/resources/application-mail.yml
src/main/resources/application-ssl.yml

### NetBeans ###
/nbproject/private/
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@ services:
- "443:443"
volumes:
- ./nginx/conf.d:/etc/nginx/conf.d
- ./nginx/certificate:/etc/letsencrypt/live/api-feelin.kro.kr
depends_on:
- application
4 changes: 2 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
spring:
profiles:
active: prod
active: local
group:
local: mail
prod: mail, ssl
prod: mail
---
spring:
config:
Expand Down

0 comments on commit ddd98aa

Please sign in to comment.