summaryrefslogtreecommitdiffstats
path: root/so-monitoring/so-monitoring-service
diff options
context:
space:
mode:
authorLukasz Muszkieta <lukasz.muszkieta@nokia.com>2020-09-02 17:35:39 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-02 17:35:39 +0000
commit43b5a2bbbe54e131981fdb96d831efc9169ddf3f (patch)
tree8956cad076b683c62ab208bcae6b7e94f5c3adf7 /so-monitoring/so-monitoring-service
parentf99da95f1f808d05e25e041e84e030612a43561d (diff)
parentec03ac8f7467df54925fef4f5d821c0bcdfcb546 (diff)
Merge "Enable HTTPS in SO-Monitoring"
Diffstat (limited to 'so-monitoring/so-monitoring-service')
-rw-r--r--so-monitoring/so-monitoring-service/pom.xml18
-rw-r--r--so-monitoring/so-monitoring-service/src/main/resources/application.yaml12
-rw-r--r--so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12bin0 -> 4071 bytes
-rw-r--r--so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jksbin0 -> 1413 bytes
4 files changed, 29 insertions, 1 deletions
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
--- /dev/null
+++ b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.p12
Binary files 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
--- /dev/null
+++ b/so-monitoring/so-monitoring-service/src/main/resources/org.onap.so.trust.jks
Binary files differ