From ec03ac8f7467df54925fef4f5d821c0bcdfcb546 Mon Sep 17 00:00:00 2001
From: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Date: Thu, 20 Aug 2020 13:44:38 +0200
Subject: Enable HTTPS in SO-Monitoring

Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Issue-ID: SO-2920
Change-Id: I8c0d5a4c68c23daa885bfb1e0d4a1f08438e6761
---
 so-monitoring/so-monitoring-service/pom.xml           |  18 ++++++++++++++++++
 .../src/main/resources/application.yaml               |  12 +++++++++++-
 .../src/main/resources/org.onap.so.p12                | Bin 0 -> 4071 bytes
 .../src/main/resources/org.onap.so.trust.jks          | Bin 0 -> 1413 bytes
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12
 create mode 100644 so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks

(limited to 'so-monitoring/so-monitoring-service')

diff --git a/so-monitoring/so-monitoring-service/pom.xml b/so-monitoring/so-monitoring-service/pom.xml
index 6671ac56d4..4a0f6cbe1d 100644
--- a/so-monitoring/so-monitoring-service/pom.xml
+++ b/so-monitoring/so-monitoring-service/pom.xml
@@ -104,6 +104,24 @@
         </executions>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <excludes>
+          <exclude>**/*.p12</exclude>
+          <exclude>**/*.jks</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <includes>
+          <include>**/*.p12</include>
+          <include>**/*.jks</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 
 </project>
diff --git a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
index dbccb76979..ef0b6aa786 100644
--- a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
+++ b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
@@ -1,8 +1,12 @@
 server:
+  ssl:
+    keyStore: classpath:org.onap.so.p12
+    keyStorePassword: 6IxlmmPs:HqNhzVP#VFuSs,%
+    trustStore: classpath:org.onap.so.trust.jks
+    trustStorePassword: 72z0TFN&xfSR;;&NrIP^QB,^
   port: 9091
   tomcat:
     max-threads: 50
-ssl-enable: false
 camunda:
   rest:
     api:
@@ -19,3 +23,9 @@ mso:
 spring:
   main:
     allow-bean-definition-overriding: true
+  security:
+    usercredentials:
+      -
+        username: gui
+        password: '$2a$10$ndkDhATUid4a3g0JJVRv2esX4rtB.vzCn7iBhKyR1qZ/wDdvNzjTS'
+        role: GUI-Client
diff --git a/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12 b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12
new file mode 100644
index 0000000000..8fa921a884
Binary files /dev/null and b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12 differ
diff --git a/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks
new file mode 100644
index 0000000000..39c310e27e
Binary files /dev/null and b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks differ
-- 
cgit 1.2.3-korg