From: James Forsyth <jf2512@att.com>
Date: Mon, 9 Apr 2018 19:23:12 +0000 (+0000)
Subject: Merge "Fix issue with Champ startup"
X-Git-Tag: 2.0.0-ONAP~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2c41376322b4dc3b2e8afc4d4ef7685439c3650a;hp=0176ae204f206d67de2cfb505f4617d135a732c9;p=aai%2Ftest-config.git

Merge "Fix issue with Champ startup"
---

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 6a71ecc..b5d4c61 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -123,13 +123,14 @@ services:
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
+      - /opt/test-config/sparky/appconfig:/opt/app/sparky/appconfig
     ports:
       - 9517:9517
     environment:
-      - CONFIG_HOME=/opt/app/sparky/config
-      - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-      - KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+      - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - SPARKY_SSL_ENABLED=false
+      - SPARKY_PORTAL_ENABLED=true
     logging:
       driver: "json-file"
       options:
diff --git a/sparky/appconfig/auth/inventory-ui-keystore b/sparky/appconfig/auth/inventory-ui-keystore
deleted file mode 100644
index 3319e63..0000000
Binary files a/sparky/appconfig/auth/inventory-ui-keystore and /dev/null differ
diff --git a/sparky/appconfig/auth/tomcat_keystore b/sparky/appconfig/auth/tomcat_keystore
new file mode 100644
index 0000000..9eec841
Binary files /dev/null and b/sparky/appconfig/auth/tomcat_keystore differ
diff --git a/sparky/appconfig/sparky-ssl-config.properties b/sparky/appconfig/sparky-ssl-config.properties
index 2c28336..b9e5d16 100644
--- a/sparky/appconfig/sparky-ssl-config.properties
+++ b/sparky/appconfig/sparky-ssl-config.properties
@@ -1,3 +1,3 @@
 server.port = 8000
-server.ssl.key-store=file:${CONFIG_HOME}/auth/inventory-ui-keystore
-server.ssl.key-alias=1
\ No newline at end of file
+server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore
+server.ssl.key-alias=tomcat
\ No newline at end of file