diff options
Diffstat (limited to 'deliveries')
| -rw-r--r-- | deliveries/.env | 7 | ||||
| -rw-r--r-- | deliveries/Apps_Users_OnBoarding_Script.sql | 9 | ||||
| -rw-r--r-- | deliveries/Dockerfile.portal | 2 | ||||
| -rwxr-xr-x | deliveries/build_portalapps_dockers.sh | 3 | ||||
| -rw-r--r-- | deliveries/docker-compose.yml | 11 |
5 files changed, 29 insertions, 3 deletions
diff --git a/deliveries/.env b/deliveries/.env index 3b2fa140..d1cc7d61 100644 --- a/deliveries/.env +++ b/deliveries/.env @@ -22,6 +22,13 @@ PORTAL_TAG=casablanca # Name of directory in apps container (NOT host) WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps +TOMCAT_DIR=/opt/apache-tomcat-8.0.37 + +# Certs +TOMCAT_KEY=keystoreONAP.keystore +TOMCAT_TRUST=truststoreONAPall.jks +CERT_PWD=changeit + # Required settings with default values. # Export shell environment variables on ALL hosts. diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql index 74017a7a..583238f0 100644 --- a/deliveries/Apps_Users_OnBoarding_Script.sql +++ b/deliveries/Apps_Users_OnBoarding_Script.sql @@ -15,6 +15,15 @@ INSERT INTO `fn_app` (`app_id`, `app_name`, `app_image_url`, `app_description`, (8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 1,'N',NULL), (9, 'MSB', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://msb-iag:80/iui/microservices/index.html', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL); +-- aaf centralize + +update fn_app set auth_central = 'Y' , auth_namespace = 'org.onap.portal' where app_id = 1; +update fn_app set auth_central = 'Y' , auth_namespace = 'org.onap.sdc' where app_id = 4; +update fn_app set auth_central = 'Y' , auth_namespace = 'org.onap.policy' where app_id = 5; +update fn_app set auth_central = 'Y' , auth_namespace = 'org.onap.vid' where app_id = 6; +update fn_app set auth_central = 'Y' , auth_namespace = 'org.onap.aai' where app_id = 7; + + -- insert SDC users user id2-8 Insert into fn_user (USER_ID, ORG_ID, MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values (2,NULL,NULL,'Jimmy',NULL,'Hendrix',NULL,NULL,NULL,'admin@onap.org',NULL,NULL,NULL,'jh0003',NULL,'jh0003','4Gl6WL1bmwviYm+XZa6pS1vC0qKXWtn9wcZWdLx61L0=','2016-10-20 15:11:16','Y',NULL,'2016-10-14 21:00:00',1,'2016-10-20 15:11:16','N',NULL,NULL,NULL,'NJ',NULL,'US',NULL,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/deliveries/Dockerfile.portal b/deliveries/Dockerfile.portal index 81eeb655..9b9f5489 100644 --- a/deliveries/Dockerfile.portal +++ b/deliveries/Dockerfile.portal @@ -11,6 +11,7 @@ ARG PORTAL_WAR=build/ecompportal-be-os.war ARG FE_DIR=build/public ARG HTTP_PROXY ARG HTTPS_PROXY +# ARG PORTAL_CERT=truststoreONAPall.jks # Just variables, never passed in ARG TOMCAT=apache-tomcat-8.0.37 @@ -31,6 +32,7 @@ RUN rm ${TOMCATTAR} # Remove manager and sample apps RUN rm -fr ${TOMCAT}/webapps/[a-z]* RUN mkdir -p /opt +COPY ${SERVERXML} ${TOMCAT}/conf RUN mv ${TOMCAT} /opt WORKDIR ${TOMCATHOME}/webapps diff --git a/deliveries/build_portalapps_dockers.sh b/deliveries/build_portalapps_dockers.sh index f7510acc..5092b407 100755 --- a/deliveries/build_portalapps_dockers.sh +++ b/deliveries/build_portalapps_dockers.sh @@ -125,13 +125,14 @@ cp $BASEDIR/ecomp-portal-DB-common/*.cql ${DELIVDIR} # SDK app cp $BASEDIR/sdk/ecomp-sdk/epsdk-app-common/db-scripts/*.cql ${DELIVDIR} - +# Build Docker Images echo "Build portal docker image" PORTAL_DOCKER_CMD=" docker build -t ${EP_IMG_NAME}:${PORTAL_TAG} ${PROXY_ARGS} --build-arg FE_DIR=$BUILD_REL/public --build-arg PORTAL_WAR=$BUILD_REL/portal-be-os.war + --build-arg SERVERXML=${DELIVDIR}/server.xml -f $PORTAL_DOCKERFILE . " $PORTAL_DOCKER_CMD diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml index bba42aac..77538542 100644 --- a/deliveries/docker-compose.yml +++ b/deliveries/docker-compose.yml @@ -99,6 +99,7 @@ services: - 8989:8080 - 8010:8009 - 8006:8005 + - 8443:8443 links: - portal-db - portal-wms @@ -116,7 +117,9 @@ services: - ${PROPS_DIR}/ONAPPORTAL/music.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/music.properties - ${PROPS_DIR}/ONAPPORTAL/openid-connect.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties - ${PROPS_DIR}/ONAPPORTAL/logback.xml:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/logback.xml - - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs + - ./${TOMCAT_TRUST}:${TOMCAT_DIR}/${TOMCAT_TRUST} + - ./${TOMCAT_KEY}:${TOMCAT_DIR}/${TOMCAT_KEY} + - ${LOGS_DIR}:${TOMCAT_DIR}/logs command: - /start-apache-tomcat.sh # see comments in .env file @@ -128,6 +131,10 @@ services: driver: json-file environment: - CATALINA_OPTS=-Xmx1536m -Xms1536m + - javax.net.ssl.keyStore=${TOMCAT_DIR}/${TOMCAT_TRUST} + - javax.net.ssl.keyStorePassword=${CERT_PWD} + - javax.net.ssl.trustStore=${TOMCAT_DIR}/${TOMCAT_TRUST} + - javax.net.ssl.trustStorePassword=${CERT_PWD} portal-sdk: image: ${SDK_IMG_NAME}:${PORTAL_TAG} ports: @@ -146,7 +153,7 @@ services: - ${PROPS_DIR}/ONAPPORTALSDK/portal.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/portal.properties - ${PROPS_DIR}/ONAPPORTALSDK/music.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/music.properties - ${PROPS_DIR}/ONAPPORTALSDK/logback.xml:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/logback.xml - - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs + - ${LOGS_DIR}:${TOMCAT_DIR}/logs command: - /start-apache-tomcat.sh logging: |