Merge "Update the code to read aaf generated passwords"

1 files changed, 11 insertions, 4 deletions

diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index 1f57c7d..f44bed4 100644
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -35,9 +35,15 @@ server.ssl.key-store-type=JKS
 
 # Start of Internal Specific Properties
 spring.profiles.active=production,one-way-ssl
-server.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore
+###
+server.certs.location=${server.local.startpath}etc/auth/
+server.keystore.name.pkcs12=aai_keystore
+server.keystore.name=aai_keystore
+server.truststore.name=aai_keystore
+###
+server.ssl.key-store=${server.certs.location}${server.keystore.name}
 server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-server.ssl.trust-store=${server.local.startpath}etc/auth/aai_keystore
+server.ssl.trust-store=${server.certs.location}${server.truststore.name}
 server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 
 schema.version.list=v10,v11,v12,v13,v14,v15,v16
@@ -86,8 +92,9 @@ schema.service.edges.endpoint=edgerules?version=
 schema.service.versions.endpoint=versions
 schema.service.custom.queries.endpoint=stored-queries
 
-schema.service.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore
-schema.service.ssl.trust-store=${server.local.startpath}etc/auth/aai_keystore
+schema.service.ssl.key-store=${server.certs.location}${server.keystore.name.pkcs12}
+schema.service.ssl.trust-store=${server.certs.location}${server.truststore.name}
+
 schema.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 schema.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 schema.service.versions.override=false