Merge "[PORTAL ] Non-root user DB access from WMS"

2 files changed, 7 insertions, 8 deletions

diff --git a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
index a53dd2e283..f5a900e8ce 100644
--- a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
+++ b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.properties
@@ -7,27 +7,26 @@ microservice.widget.location=/tmp
 

 ## App DB Properties

 spring.datasource.url=jdbc:mysql://portal-db:3306/portal

-spring.datasource.username=root

-spring.datasource.password=Aa123456

+spring.datasource.username=${PORTAL_DB_USER}

+spring.datasource.password=${PORTAL_DB_PASSWORD}

 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect

 spring.database.driver.classname=org.mariadb.jdbc.Driver

 spring.jpa.show-sql=false

 spring.jpa.properties.hibernate.format_sql=false

 

 ## Basic Authentication Properties

-security.user.name=widget_user

-security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)

+security.user.name=${WIDGET_USER}

+security.user.password=${WIDGET_PASSWORD}

 

 initialization.default.widgets=true

 initialization.widgetData.url=http://portal-app:{{.Values.global.portalPort}}/ONAPPORTAL/commonWidgets

 

 ## Account Basic Authentication Properties

-account.user.name=portal

-account.user.password=6APqvG4AU2rfLgCvMdySwQ==

+account.user.name=${ACC_USER}

+account.user.password=${ACC_PASSWORD}

 

 ## Certificate Properties

 #server.ssl.key-store=classpath:widget-keystore.p12

 #server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8)

 #server.ssl.keyStoreType=PKCS12

 #server.ssl.keyAlias=widget-microservice

-

diff --git a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml
index 08a9714506..f3da66f882 100644
--- a/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml
+++ b/kubernetes/portal/components/portal-widget/resources/config/deliveries/properties/ONAPWIDGETMS/application.yml
@@ -16,4 +16,4 @@
 
 jasypt:
   encryptor:
-    password: EncryptionKey
+    password: ${JASYPT_ENC_KEY}