From ff6340c554ee6e257a53f09b7c8b286d2ea197b7 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 13 Mar 2019 12:03:07 +0200 Subject: New VID certificate valid until: March 12, 2020 Alias name: vid@vid.onap.org Owner: C=US, O=ONAP, OU=OSAAF, OU=vid@vid.onap.org, EMAILADDRESS=, CN=vid Issuer: CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US Valid from: Tue Mar 12 15:26:01 GMT 2019 until: Thu Mar 12 15:26:01 GMT 2020 SubjectAlternativeName [ DNSName: vid DNSName: vid.api.simpledemo.onap.org DNSName: vid.onap ] (cherry picked from commit 9514224ee2a39fbb8102f0b137c3c9d320f7f16e) Issue-ID: VID-446 Change-Id: I3aa02e8d4e840568d2dd74d442e4ab9c9e041399 Signed-off-by: Ittay Stern --- deliveries/src/main/docker/docker-files/Dockerfile | 180 ++++++++++----------- .../src/main/webapp/WEB-INF/cert/org.onap.vid.jks | Bin 3573 -> 3576 bytes 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index 8cd2bc7aa..ba96c4b3e 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -1,90 +1,90 @@ -FROM tomcat:8.0-jre8 -# add vim and uncomment alias to speedup troubleshooting purpose -RUN apt-get update && apt-get install -y \ - openjdk-8-jdk vim net-tools - -RUN sed -i 's/# alias/alias/g' /root/.bashrc - -RUN mkdir -p ${ROOT_DIR}/etc - -ENV JAVA_OPTS="-Xmx1536m -Xms1536m" - -ENV ROOT_DIR /opt/app/vid - -ENV ASDC_CLIENT_TYPE REST -ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.onap.org -#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z -ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= -ENV ASDC_CLIENT_REST_PROTOCOL http -ENV ASDC_CLIENT_REST_PORT 8080 -ENV ASDC_CLIENT_MODEL_NAMESPACE org.onap - -ENV CACHE_DIRECTORY $ROOT_DIR/cache - -ENV LOG4J_LOGLEVEL INFO -ENV LOG4J_APPENDER rollingfile -ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs - -ENV VID_AAI_HOST aai.api.simpledemo.onap.org -ENV VID_AAI_PORT 8443 -ENV VID_APP_DISPLAY_NAME VID -ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context -ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra -ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins -ENV VID_MSO_USER InfraPortalClient -ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz -ENV MSO_DME2_CLIENT_TIMEOUT 10000 -ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000 -ENV MSO_DME2_SERVER_URL http://localhost:8081 -ENV MSO_DME2_ENABLED false -ENV MSO_POLLING_INTERVAL_MSECS 10000 -ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore -ENV AAI_TRUSTSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -ENV AAI_KEYSTORE_FILENAME tomcat_keystore -ENV AAI_KEYSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -ENV AAI_VID_UID VID -ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9 -ENV AAI_USE_CLIENT_CERT false -ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED -ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm -ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi -ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context -ENV VID_ROLE_ACCESS_CENTRALIZED local -ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com - -ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o= -ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org -ENV VID_UEB_CONSUMER_GROUP VID -ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX -ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD -ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da -ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 -ENV VID_UEB_LISTENERS_ENABLE false - -ENV VID_LOG_DIR ${ROOT_DIR}/logs -ENV VID_LOG_LEVEL INFO - -ENV VID_MYSQL_HOST vid-mariadb-docker-instance -ENV VID_MYSQL_PORT 3306 -ENV VID_MYSQL_DBNAME vid_portal -ENV VID_MYSQL_USER vidadmin -ENV VID_MYSQL_MAXCONNECTIONS 5 -ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks -ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks -ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2 -ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/ -ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}" - -ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME} -ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME} -ADD maven/config/server.xml ${VID_TOMCAT_PATH} - -ADD maven/scripts/*.sh /tmp/vid/ -ADD maven/artifacts/vid.war /tmp/vid/stage/ - -RUN chmod +x /tmp/vid/localize.sh - -CMD ["/tmp/vid/localize.sh"] +FROM tomcat:8.0-jre8 +# add vim and uncomment alias to speedup troubleshooting purpose +RUN apt-get update && apt-get install -y \ + openjdk-8-jdk vim net-tools + +RUN sed -i 's/# alias/alias/g' /root/.bashrc + +RUN mkdir -p ${ROOT_DIR}/etc + +ENV JAVA_OPTS="-Xmx1536m -Xms1536m" + +ENV ROOT_DIR /opt/app/vid + +ENV ASDC_CLIENT_TYPE REST +ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.onap.org +#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z +ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= +ENV ASDC_CLIENT_REST_PROTOCOL http +ENV ASDC_CLIENT_REST_PORT 8080 +ENV ASDC_CLIENT_MODEL_NAMESPACE org.onap + +ENV CACHE_DIRECTORY $ROOT_DIR/cache + +ENV LOG4J_LOGLEVEL INFO +ENV LOG4J_APPENDER rollingfile +ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs + +ENV VID_AAI_HOST aai.api.simpledemo.onap.org +ENV VID_AAI_PORT 8443 +ENV VID_APP_DISPLAY_NAME VID +ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context +ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra +ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins +ENV VID_MSO_USER InfraPortalClient +ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz +ENV MSO_DME2_CLIENT_TIMEOUT 10000 +ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000 +ENV MSO_DME2_SERVER_URL http://localhost:8081 +ENV MSO_DME2_ENABLED false +ENV MSO_POLLING_INTERVAL_MSECS 10000 +ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore +ENV AAI_TRUSTSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp +ENV AAI_KEYSTORE_FILENAME tomcat_keystore +ENV AAI_KEYSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp +ENV AAI_VID_UID VID +ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9 +ENV AAI_USE_CLIENT_CERT false +ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED +ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm +ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi +ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context +ENV VID_ROLE_ACCESS_CENTRALIZED local +ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com + +ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o= +ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org +ENV VID_UEB_CONSUMER_GROUP VID +ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX +ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD +ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da +ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 +ENV VID_UEB_LISTENERS_ENABLE false + +ENV VID_LOG_DIR ${ROOT_DIR}/logs +ENV VID_LOG_LEVEL INFO + +ENV VID_MYSQL_HOST vid-mariadb-docker-instance +ENV VID_MYSQL_PORT 3306 +ENV VID_MYSQL_DBNAME vid_portal +ENV VID_MYSQL_USER vidadmin +ENV VID_MYSQL_MAXCONNECTIONS 5 +ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + +ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks +ENV VID_KEYSTORE_PASSWORD="ry1RLC\(\?M6\?2fQ\]1a2\)2y\{P:" +ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks +ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2 +ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/ +ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}" + +ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME} +ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME} +ADD maven/config/server.xml ${VID_TOMCAT_PATH} + +ADD maven/scripts/*.sh /tmp/vid/ +ADD maven/artifacts/vid.war /tmp/vid/stage/ + +RUN chmod +x /tmp/vid/localize.sh + +CMD ["/tmp/vid/localize.sh"] diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.jks b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.jks index aab34aebe..3c2ce9157 100644 Binary files a/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.jks and b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/org.onap.vid.jks differ -- cgit 1.2.3-korg