Merge "Fix the docker push"

[clamp.git] / src / main / resources / application.properties

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b59d0ee..9a9bd28 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -30,7 +30,7 @@ info.build.version=@project.version@
 ### (See below for the parameter 'server.http.port' if you want to have both enabled)\r
 ### To have only HTTP, keep the lines server.ssl.* commented\r
 ### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location\r
-server.port=8080\r
+### server.port=8080\r
 ### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')\r
 #server.ssl.key-store=file:/tmp/mykey.jks\r
 #server.ssl.key-store-password=pass\r
@@ -54,15 +54,21 @@ server.port=8080
 \r
 ### HTTP (Redirected to HTTPS) and HTTPS Example:\r
 ### --------------------------------------------\r
-### server.port=8443           <-- The HTTPS port\r
-### server.ssl.key-store=file:/tmp/mykey.jks\r
-### server.ssl.key-store-password=mypass\r
-### server.ssl.key-password=mypass\r
-### server.http-to-https-redirection.port=8090  <-- The HTTP port\r
+server.port=8443\r
+server.ssl.client-auth=want\r
+server.ssl.key-store=file:/opt/clamp/config/org.onap.clamp.p12\r
+server.ssl.key-store-password=China in the Spring\r
+server.ssl.key-password=China in the Spring\r
+server.ssl.key-store-type=PKCS12\r
+server.ssl.trust=/opt/clamp/config/truststoreONAPall.jks\r
+server.ssl.trust-pass=changeit\r
+server.ssl.trust-type=JKS\r
+server.ssl.key-alias=clamp@clamp.onap.org\r
+server.http-to-https-redirection.port=8080\r
 \r
 server.contextPath=/\r
 #Modified engine-rest applicationpath\r
-spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller\r
+spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller\r
 \r
 #The max number of active threads in this pool\r
 server.tomcat.max-threads=200\r
@@ -106,6 +112,8 @@ async.core.pool.size=10
 async.max.pool.size=20\r
 async.queue.capacity=500\r
 \r
+clamp.config.log.path=/var/log/onap\r
+clamp.config.files.systemProperties=classpath:/system.properties\r
 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json\r
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json\r
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json\r
@@ -162,7 +170,7 @@ clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-te
 #\r
 clamp.config.op.policyDescription=from clds\r
 # default\r
-clamp.config.op.templateName=ClosedLoopvUSP\r
+clamp.config.op.templateName=ClosedLoopControlName\r
 clamp.config.op.operationTopic=APPC-CL\r
 clamp.config.op.notificationTopic=POLICY-CL-MGT\r
 clamp.config.op.controller=amsterdam\r
@@ -200,14 +208,30 @@ clamp.config.dcae.intentory.retry.interval=10000
 clamp.config.dcae.intentory.retry.limit=3\r
 \r
 #DCAE Dispatcher Url Properties\r
-clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
+clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8188\r
+clamp.config.dcae.dispatcher.retry.interval=10000\r
+clamp.config.dcae.dispatcher.retry.limit=10\r
 clamp.config.dcae.header.requestId = X-ECOMP-RequestID\r
 \r
 #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !\r
-clamp.config.security.permission.type.cl=permission-type-cl\r
-clamp.config.security.permission.type.cl.manage=permission-type-cl-manage\r
-clamp.config.security.permission.type.cl.event=permission-type-cl-event\r
-clamp.config.security.permission.type.filter.vf=permission-type-filter-vf\r
-clamp.config.security.permission.type.template=permission-type-template\r
+clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl\r
+clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage\r
+clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event\r
+clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf\r
+clamp.config.security.permission.type.template=org.onap.clamp.clds.template\r
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties\r
 clamp.config.security.permission.instance=dev\r
+\r
+#AAF related parameters\r
+clamp.config.cadi.keyFile=/opt/clamp/config/org.onap.clamp.keyfile\r
+clamp.config.cadi.cadiLoglevel=INFO\r
+clamp.config.cadi.cadiLatitude=37.78187\r
+clamp.config.cadi.cadiLongitude=-122.26147\r
+clamp.config.cadi.aafLocateUrl=https://aaf-onap-beijing-test.osaaf.org\r
+clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs\r
+clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf\r
+#clamp.config.cadi.oauthTokenUrl=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token\r
+#clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect\r
+clamp.config.cadi.aafEnv=DEV\r
+clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0\r
+clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US\r