summaryrefslogtreecommitdiffstats
path: root/policy-management/src/main
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-08-20 18:33:55 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-20 18:33:55 +0000
commit181e4d4f95d7fab6b1e134406a22b568a9881bf3 (patch)
treeaedf26707492af60d678826b7e4ab7ab1a7efe5b /policy-management/src/main
parent13d0d6b9f3a88a32ca9aff945469c7aa9f19292b (diff)
parent3bbdb237654a09496c2916ce2c7545f2aabbe339 (diff)
Merge "https certs with aaf+pdpd containers compatibility"
Diffstat (limited to 'policy-management/src/main')
-rw-r--r--policy-management/src/main/server/config/policy-engine.properties17
-rw-r--r--policy-management/src/main/server/config/system.properties11
2 files changed, 22 insertions, 6 deletions
diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties
index 70a5dcca..c89b95bb 100644
--- a/policy-management/src/main/server/config/policy-engine.properties
+++ b/policy-management/src/main/server/config/policy-engine.properties
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# policy-management
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -37,7 +37,11 @@ ueb.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.apiSecret=${{PDPD_CONFIGURATION_AP
ueb.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.partitionKey=${{PDPD_CONFIGURATION_PARTITION_KEY}}
ueb.sink.topics.${{PDPD_CONFIGURATION_TOPIC}}.managed=false
-http.server.services=CONFIG
+# temporary configuration to support an http and https server,
+# to support the incremental phase out of http.
+
+http.server.services=CONFIG,SECURED-CONFIG
+
http.server.services.CONFIG.host=${{ENGINE_MANAGEMENT_HOST}}
http.server.services.CONFIG.port=${{ENGINE_MANAGEMENT_PORT}}
http.server.services.CONFIG.userName=${{ENGINE_MANAGEMENT_USER}}
@@ -45,3 +49,12 @@ http.server.services.CONFIG.password=${{ENGINE_MANAGEMENT_PASSWORD}}
http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
http.server.services.CONFIG.managed=false
http.server.services.CONFIG.swagger=true
+
+http.server.services.SECURED-CONFIG.host=${{ENGINE_MANAGEMENT_HOST}}
+http.server.services.SECURED-CONFIG.port=9697
+http.server.services.SECURED-CONFIG.userName=${{ENGINE_MANAGEMENT_USER}}
+http.server.services.SECURED-CONFIG.password=${{ENGINE_MANAGEMENT_PASSWORD}}
+http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful
+http.server.services.SECURED-CONFIG.managed=false
+http.server.services.SECURED-CONFIG.swagger=true
+http.server.services.SECURED-CONFIG.https=true
diff --git a/policy-management/src/main/server/config/system.properties b/policy-management/src/main/server/config/system.properties
index 7f92c879..5c024e15 100644
--- a/policy-management/src/main/server/config/system.properties
+++ b/policy-management/src/main/server/config/system.properties
@@ -1,8 +1,8 @@
###
# ============LICENSE_START=======================================================
-# policy-management
+# ONAP
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,8 +28,11 @@ com.sun.management.jmxremote.ssl=false
# certs
-javax.net.ssl.trustStore=${{POLICY_HOME}}/etc/ssl/policy-keystore
-javax.net.ssl.trustStorePassword=${{KEYSTORE_PASSWD}}
+javax.net.ssl.trustStore=${{POLICY_HOME}}/etc/ssl/policy-truststore
+javax.net.ssl.trustStorePassword=${{TRUSTSTORE_PASSWD}}
+
+javax.net.ssl.keyStore=${{POLICY_HOME}}/etc/ssl/policy-keystore
+javax.net.ssl.keyStorePassword=${{KEYSTORE_PASSWD}}
# standard logging