Merge "[DMAAP-DR-PROV] Remove aaf & cadi"

[dmaap/datarouter.git] / datarouter-prov / src / main / resources / provserver.properties

diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 66d4e6c..2582498 100755 (executable)
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -31,12 +31,17 @@ org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spoo
 org.onap.dmaap.datarouter.provserver.dbscripts           = /opt/app/datartr/etc/misc
 org.onap.dmaap.datarouter.provserver.logretention        = 30
 
-org.onap.dmaap.datarouter.provserver.aafprops.path       = /opt/app/osaaf/local/org.onap.dmaap-dr.props
 org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
-
-org.onap.dmaap.datarouter.provserver.cadi.enabled         = false
-
 org.onap.dmaap.datarouter.provserver.tlsenabled           = false
+# If tlsenabled is true, the following keystore info must be set
+org.onap.dmaap.datarouter.provserver.keystoretype         = PKCS12
+org.onap.dmaap.datarouter.provserver.keystorepath         = /opt/app/datartr/certs/org.onap.dmaap-dr-prov.p12
+org.onap.dmaap.datarouter.provserver.keystorepassword     = secret
+org.onap.dmaap.datarouter.provserver.keymanagerpassword   = secret
+org.onap.dmaap.datarouter.provserver.truststoretype       = jks
+org.onap.dmaap.datarouter.provserver.truststorepath       = /opt/app/datartr/certs/truststore.jks
+org.onap.dmaap.datarouter.provserver.truststorepassword   = secret
+
 org.onap.dmaap.datarouter.nodeserver.https.port           = 8443
 org.onap.dmaap.datarouter.nodeserver.http.port            = 8080