Oracle WebCenter Sites 21.1.1 release (#39)

* Oracle WebCenter Sites 21.1.1

Co-authored-by: prashant.s.shukla@oracle.com <prshshuk@prshshuk-1.subnet1phx1.devcecphx.oraclevcn.com>

Author: prshshuk

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/ingress-per-domain/templates/nginx-ingress.yaml

@@ -1,5 +1,8 @@
-# Copyright (c) 2020 Oracle Corporation and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
+
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -49,7 +52,7 @@ spec:
   sessionAffinity: None
   type: LoadBalancer
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: oracle-db

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/create-database/db-with-pv.yaml renamed to OracleWebCenterSites/kubernetes/create-wcsites-domain/create-database/db-with-pv.yaml

@@ -1,5 +1,8 @@
-# Copyright (c) 2020 Oracle Corporation and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -23,7 +26,7 @@ spec:
   selector:
     app: wcsitesdb
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: wcsitesdb

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/create-database/db-without-pv.yaml renamed to OracleWebCenterSites/kubernetes/create-wcsites-domain/create-database/db-without-pv.yaml

@@ -1,6 +1,8 @@
 #!/bin/bash
-# Copyright 2020, Oracle Corporation and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
 #
 
 function exitIfError {
@@ -13,6 +15,9 @@ function exitIfError {
 # Include common utility functions
 source ${CREATE_DOMAIN_SCRIPT_DIR}/utility.sh
 
+export CUSTOM_MANAGED_BASE_NAME=${CUSTOM_MANAGED_BASE_NAME,,}
+export CUSTOM_ADMIN_NAME=${CUSTOM_ADMIN_NAME,,}
+
 # Verify the script to create the domain exists
 script=${CREATE_DOMAIN_SCRIPT_DIR}/createSitesDomain.sh
 
@@ -58,7 +63,10 @@ sed -i -e "s:%SITES_APP_USERNAME%:${SITES_APP_USERNAME}:g" ${DOMAIN_HOME_DIR}/se
 sed -i -e "s:%SITES_APP_PASSWORD%:${SITES_APP_PASSWORD}:g" ${DOMAIN_HOME_DIR}/server-config-update.sh
 sed -i -e "s:%SITES_SS_USERNAME%:${SITES_SS_USERNAME}:g" ${DOMAIN_HOME_DIR}/server-config-update.sh
 sed -i -e "s:%SITES_SS_PASSWORD%:${SITES_SS_PASSWORD}:g" ${DOMAIN_HOME_DIR}/server-config-update.sh
+sed -i -e "s:%DOMAIN_HOME%:${DOMAIN_HOME_DIR}:g" ${DOMAIN_HOME_DIR}/server-config-update.sh
+sed -i -e "s:%DOMAIN_ROOT_DIR%:${DOMAIN_ROOT_DIR}:g" ${DOMAIN_HOME_DIR}/server-config-update.sh
 
+
 # DON'T REMOVE THIS
 # This script has to contain this log message. 
 # It is used to determine if the job is really completed.

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/domain-home-on-pv/common/create-domain-job.sh renamed to OracleWebCenterSites/kubernetes/create-wcsites-domain/domain-home-on-pv/common/create-domain-job.sh

@@ -1,5 +1,7 @@
-# Copyright 2020, Oracle Corporation and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
 
 import os
 import sys

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/domain-home-on-pv/common/createSitesDomain.py renamed to OracleWebCenterSites/kubernetes/create-wcsites-domain/domain-home-on-pv/common/createSitesDomain.py

@@ -1,8 +1,8 @@
 #!/bin/bash
+# Copyright (c) 2021, Oracle and/or its affiliates.
 #
-# Copyright (c) 2020 Oracle and/or its affiliates.
-#
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
 #
 # Description: This script is used to Execute RCU.
 #
@@ -78,125 +78,6 @@ DB_PASSWORD=`cat /weblogic-operator/rcu-secrets/sys_password`
 DB_SCHEMA_PASSWORD=`cat /weblogic-operator/rcu-secrets/password`
 RCU_PREFIX=$CUSTOM_RCUPREFIX
 
-#if [ -z ${DOMAIN_NAME} ]
-#then
-#    DOMAIN_NAME=base_domain
-#    echo ""
-#    echo " Setting DOMAIN_NAME to base_domain"
-#    echo ""
-#fi
-#
-#if [ -z ${SITES_SERVER_NAME} ]
-#then
-#    SITES_SERVER_NAME=wcsites_server1
-#    echo ""
-#    echo " Setting SITES_SERVER_NAME to wcsites_server1"
-#    echo ""
-#fi
-#
-#if [ -z ${ADMIN_USERNAME} ]
-#then
-#    ADMIN_USERNAME=weblogic
-#    echo ""
-#    echo " Setting ADMIN_USERNAME to weblogic"
-#    echo ""
-#fi
-#
-#if [ -z ${SITES_ADMIN_USERNAME} ]
-#then
-#    SITES_ADMIN_USERNAME=ContentServer
-#    echo ""
-#    echo " Setting SITES_ADMIN_USERNAME to ContentServer"
-#    echo ""
-#fi
-#
-#if [ -z ${SITES_APP_USERNAME} ]
-#then
-#    SITES_APP_USERNAME=fwadmin
-#    echo ""
-#    echo " Setting SITES_APP_USERNAME to fwadmin"
-#    echo ""
-#fi
-#
-#if [ -z ${SITES_SS_USERNAME} ]
-#then
-#    SITES_SS_USERNAME=SatelliteServer
-#    echo ""
-#    echo " Setting SITES_SS_USERNAME to SatelliteServer"
-#    echo ""
-#fi
-#
-#if [ -z ${SAMPLES} ]
-#then
-#    SAMPLES=false
-#    echo ""
-#    echo " Setting samples to false"
-#    echo ""
-#fi
-#
-#if [ -z ${ADMIN_PASSWORD} ]
-#then
-#    # Auto generate Oracle WebLogic Server admin password
-#    ADMIN_PASSWORD=$(rand_pwd)
-#	ADMIN_PASSWORD_AUTOGENERATED=true
-#    echo ""
-#    echo "    Oracle WebLogic Server Password Auto Generated :"
-#    echo ""
-#    echo "    ----> Username: $ADMIN_USERNAME ----> Password: $ADMIN_PASSWORD"
-#    echo ""
-#fi;
-#
-#if [ -z ${DB_SCHEMA_PASSWORD} ]
-#then
-#    # Auto generate Oracle Database Schema password
-#    temp_pwd=$(rand_pwd)
-#    #Password should not start with a number for database
-#    f_str=`echo $temp_pwd|cut -c1|tr [0-9] [A-Z]`
-#    s_str=`echo $temp_pwd|cut -c2-`
-#    DB_SCHEMA_PASSWORD=${f_str}${s_str}
-#	DB_SCHEMA_PASSWORD_AUTOGENERATED=true
-#    echo ""
-#    echo "    Database Schema password Auto Generated :"
-#    echo ""
-#    echo "    ----> Database schema password: $DB_SCHEMA_PASSWORD"
-#    echo ""
-#fi
-#
-#if [ -z ${SITES_ADMIN_PASSWORD} ]
-#then
-#    # Auto generate Oracle WebCenter Sites Administrator password
-#    SITES_ADMIN_PASSWORD=$(rand_pwd)
-#	SITES_ADMIN_PASSWORD_AUTOGENERATED=true
-#    echo ""
-#    echo "    Oracle WebCenter Sites Administrator Password Auto Generated :"
-#    echo ""
-#    echo "    ----> Username: $SITES_ADMIN_USERNAME ----> Password: $SITES_ADMIN_PASSWORD"
-#    echo ""
-#fi;
-#
-#if [ -z ${SITES_APP_PASSWORD} ]
-#then
-#    # Auto generate Oracle WebCenter Sites Application password
-#    SITES_APP_PASSWORD=$(rand_pwd)
-#	SITES_APP_PASSWORD_AUTOGENERATED=true
-#    echo ""
-#    echo "    Oracle WebCenter Sites Application Password Auto Generated :"
-#    echo ""
-#    echo "    ----> Username: $SITES_APP_USERNAME ----> Password: $SITES_APP_PASSWORD"
-#    echo ""
-#fi;
-#
-#if [ -z ${SITES_SS_PASSWORD} ]
-#then
-#    # Auto generate Oracle WebCenter Sites SatelliteServer password
-#    SITES_SS_PASSWORD=$(rand_pwd)
-#	SITES_SS_PASSWORD_AUTOGENERATED=true
-#    echo ""
-#    echo "    Oracle WebCenter Sites SatelliteServer Password Auto Generated :"
-#    echo ""
-#    echo "    ----> Username: $SITES_SS_USERNAME ----> Password: $SITES_SS_PASSWORD"
-#    echo ""
-#fi;
 
 # These values can be parameterized later on. Hardcoding for now.
 export DOCKER_HOST=$LB_HOST
@@ -279,33 +160,14 @@ fi
 # Export Domain Home/Root
 #=========================
 export DOMAIN_NAME=$DOMAIN_NAME
-export DOMAIN_ROOT="/u01/oracle/user_projects/domains"
+export DOMAIN_ROOT=$DOMAIN_ROOT_DIR
 export DOMAIN_HOME="${DOMAIN_ROOT}/${DOMAIN_NAME}"
 
-echo ""
-echo ""
-#echo "Notedown Auto Generated Sites, WebLogic Server and Database Schema passwords:"
 echo ""
 if [ $DB_SCHEMA_PASSWORD_AUTOGENERATED == "true" ]; then
 	echo "    ----> Oracle Database Schema Credential:	Password: $DB_SCHEMA_PASSWORD"    
 fi
 
-#if [ $ADMIN_PASSWORD_AUTOGENERATED == "true" ]; then
-#	echo "    ----> Oracle WebLogic Server Credential:	Username: $ADMIN_USERNAME	Password: $ADMIN_PASSWORD"
-#fi
-
-#if [ $SITES_ADMIN_PASSWORD_AUTOGENERATED == "true" ]; then
-#	echo "    ----> Oracle WebCenter Sites Administrator Credential:	Username: $SITES_ADMIN_USERNAME	Password: $SITES_ADMIN_PASSWORD"
-#fi
-
-#if [ $SITES_APP_PASSWORD_AUTOGENERATED == "true" ]; then
-#	echo "    ----> Oracle WebCenter Sites Application Credential:	Username: $SITES_APP_USERNAME	Password: $SITES_APP_PASSWORD"
-#fi
-
-#if [ $SITES_SS_PASSWORD_AUTOGENERATED == "true" ]; then
-#	echo "    ----> Oracle WebCenter Sites SatelliteServer Credential:	Username: $SITES_SS_USERNAME Password: $SITES_SS_PASSWORD"
-#fi
-
 
 
 INSTALL_END=$(date '+%s')

OracleWebCenterSites/kubernetes/2.4.0/create-wcsites-domain/domain-home-on-pv/common/createSitesDomain.sh renamed to OracleWebCenterSites/kubernetes/create-wcsites-domain/domain-home-on-pv/common/createSitesDomain.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
+#
+
+# Drop the RCU schema based on schemaPreifix and Database URL
+
+DB_CONNECTSTRING=$CUSTOM_CONNECTION_STRING
+DB_USER=`cat /weblogic-operator/rcu-secrets/sys_username`
+DB_PASSWORD=`cat /weblogic-operator/rcu-secrets/sys_password`
+DB_SCHEMA_PASSWORD=`cat /weblogic-operator/rcu-secrets/password`
+RCU_PREFIX=$CUSTOM_RCUPREFIX
+rcuType=fmw
+
+
+echo "${DB_PASSWORD}" > pwd.txt
+echo "${DB_SCHEMA_PASSWORD}" >> pwd.txt
+
+echo "dropping RCU schema with following parameters ${DB_CONNECTSTRING} ${RCU_PREFIX} ${rcuType} ${DB_PASSWORD}"
+source ${CREATE_DOMAIN_SCRIPT_DIR}/dropRepository.sh ${DB_CONNECTSTRING} ${RCU_PREFIX} ${rcuType} ${DB_PASSWORD}

OracleWebCenterSites/kubernetes/create-wcsites-domain/domain-home-on-pv/common/drop-rcu-schema.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# Copyright (c) 2021, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at 
+# https://oss.oracle.com/licenses/upl
+
+. /u01/oracle/wlserver/server/bin/setWLSEnv.sh
+
+echo "Check if the DB Service is ready to accept request "
+connectString=${1:-oracle-db.wcsitesdb-ns.svc.cluster.local:1521/devpdb.k8s}
+schemaPrefix=${2:-WCS1}
+rcuType=${3:-fmw}
+sysPassword=${4:-Oradoc_db1}
+
+echo "DB Connection String [$connectString] schemaPrefix [${schemaPrefix}] rcuType[${rcuType}]"
+
+max=20
+counter=0
+while [ $counter -le ${max} ]
+do
+ java utils.dbping ORACLE_THIN "sys as sysdba" ${sysPassword} ${connectString} > dbping.err 2>&1 
+ [[ $? == 0 ]] && break;
+ ((counter++))
+ echo "[$counter/${max}] Retrying the DB Connection ..."
+ sleep 10
+done
+
+if [ $counter -gt ${max} ]; then 
+ echo "[ERROR] Oracle DB Service is not ready after [${max}] iterations ..."
+ exit -1
+else 
+ java utils.dbping ORACLE_THIN "sys as sysdba" ${sysPassword} ${connectString}
+fi 
+
+# SOA needs extra component(s) SOAINFRA ESS (optional)
+# SOA needs variables param(s) SOA_PROFILE_TYPE=SMALL,HEALTHCARE_INTEGRATION=NO
+
+case $rcuType in
+ fmw)
+   extComponents=""
+   extVariables=""
+   echo "Dropping RCU Schema for FMW Domain ..."
+   ;;
+ * )
+    echo "[ERROR] Unknown RCU Schema Type [$rcuType]"
+    echo "Supported values: fmw(default),soa,osb,soaosb,soaess,soaessosb"
+    exit -1
+  ;;
+esac
+
+echo "Extra RCU Schema Component(s) Choosen[${extComponents}]" 
+echo "Extra RCU Schema Variable(s)  Choosen[${extVariables}]" 
+
+/u01/oracle/oracle_common/bin/rcu -silent -dropRepository \
+ -databaseType ORACLE -connectString ${connectString} \
+ -dbUser sys  -dbRole sysdba \
+ -selectDependentsForComponents true \
+ -schemaPrefix ${schemaPrefix} ${extComponents} ${extVariables}  \
+ -component MDS -component IAU -component IAU_APPEND -component IAU_VIEWER \
+ -component OPSS  -component WLS -component STB -component WCSITES < /u01/oracle/pwd.txt