Skip to content

Commit 82b0692

Browse files
committed
Placed ssl parameters in application-config.yml only
1 parent 697cc2e commit 82b0692

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

config/datart.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ datasource.password=
1010
# server
1111
server.port=8080
1212
server.address=0.0.0.0
13-
server.ssl.enabled=false
14-
server.ssl.key-store=
15-
server.ssl.key-store-password=
16-
server.ssl.keyStoreType=PKCS12
17-
server.ssl.keyAlias:
1813

19-
# datart config. can change to https if ssl is enabled
14+
# datart config.
2015
datart.address=http://127.0.0.1
2116
datart.send-mail=false
2217
datart.webdriver-path=http://127.0.0.1:4444/wd/hub

config/profiles/application-config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ spring:
6262
server:
6363
port: ${server.port:8080}
6464
address: ${server.ip:0.0.0.0}
65-
ssl.enabled: ${server.ssl.enabled:false}
66-
ssl.key-store: ${server.ssl.key-store:keystore.p12}
67-
ssl.key-store-password: ${server.ssl.key-store-password:password}
68-
ssl.keyStoreType: ${server.ssl.keyStoreType:PKCS12}
69-
ssl.keyAlias: ${server.ssl.keyAlias:tomcat}
65+
ssl.enabled: false
66+
ssl.key-store: keystore.p12 # Absolute path
67+
ssl.key-store-password: password
68+
ssl.keyStoreType: PKCS12
69+
ssl.keyAlias: tomcat
7070

7171
datart:
7272
server:

0 commit comments

Comments
 (0)