From aa06b14a3687391454c9036c8a5240a42981c886 Mon Sep 17 00:00:00 2001 From: Sanjay Mantoor Date: Mon, 5 Jul 2021 04:45:47 +0000 Subject: [PATCH 1/2] Updated as per security review comments --- .../src/main/arm/mainTemplate.json | 32 ++--- .../_sslKeyVaultNestedTemplate.json | 13 +- .../nestedtemplates/aadNestedTemplate.json | 12 +- .../clusterCustomSSLTemplate.json | 10 +- .../nestedtemplates/coherenceTemplate.json | 20 +-- .../nestedtemplates/ohsNestedTemplate.json | 8 +- .../src/main/scripts/aadIntegration.sh | 74 +++++------ .../main/scripts/datasourceConfig-oracle.sh | 26 ++-- .../scripts/datasourceConfig-postgresql.sh | 26 ++-- .../scripts/datasourceConfig-sqlserver.sh | 26 ++-- .../elkIntegrationForConfiguredCluster.sh | 44 +++---- .../elkIntegrationForDynamicCluster.sh | 50 ++++---- .../src/main/scripts/setupCoherence.sh | 98 +++++++------- .../main/scripts/setupDynamicClusterDomain.sh | 120 +++++++++--------- .../src/main/scripts/setupOHS.sh | 58 ++++----- .../src/main/scripts/updateDNSZones.sh | 22 ++-- .../test/scripts/gen-parameters-aad-ag.sh | 3 + .../test/scripts/gen-parameters-aad.sh | 3 + .../test/scripts/gen-parameters-coherence.sh | 3 + .../test/scripts/gen-parameters-db-aad.sh | 3 + .../test/scripts/gen-parameters-db.sh | 3 + ...gen-parameters-deploy-addnode-coherence.sh | 3 + .../scripts/gen-parameters-deploy-addnode.sh | 3 + .../gen-parameters-deploy-coherence.sh | 3 + .../test/scripts/gen-parameters-deploy.sh | 2 +- .../test/scripts/gen-parameters-elk.sh | 3 + .../test/scripts/gen-parameters.sh | 5 +- 27 files changed, 351 insertions(+), 322 deletions(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json index d378f99d8..5f9ab4dbc 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json @@ -240,11 +240,11 @@ } }, "uploadedCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Data" }, - "defaultValue": "customIdentityKeyStoreData" + "defaultValue": "" }, "uploadedCustomIdentityKeyStorePassphrase": { "type": "securestring", @@ -261,11 +261,11 @@ "defaultValue": "JKS" }, "uploadedCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore Data" }, - "defaultValue": "customTrustKeyStoreData" + "defaultValue": "" }, "uploadedCustomTrustKeyStorePassPhrase": { "type": "securestring", @@ -513,7 +513,7 @@ }, "uploadedKeyStoreData": { "defaultValue": "", - "type": "string", + "type": "securestring", "metadata": { "description": "SSL Certificate Data for OHS" } @@ -533,14 +533,14 @@ } }, "vmSizeSelect": { - "defaultValue": "Standard_A1", + "defaultValue": "Standard_A2_v2", "type": "string", "metadata": { "description": "Select appropriate VM Size as per requirement" } }, "vmSizeSelectForCoherence": { - "defaultValue": "Standard_A3", + "defaultValue": "Standard_A2_v2", "type": "string", "metadata": { "description": "Select appropriate VM Size for Coherence" @@ -554,15 +554,15 @@ } }, "wlsLDAPGroupBaseDN": { - "defaultValue": "null", - "type": "string", + "defaultValue": "", + "type": "securestring", "metadata": { "description": "The base distinguished name (DN) of the tree in the LDAP directory that contains groups." } }, "wlsLDAPPrincipal": { - "defaultValue": "null", - "type": "string", + "defaultValue": "", + "type": "securestring", "metadata": { "description": "The Distinguished Name (DN) of the LDAP user that WebLogic Server should use to connect to the LDAP server." } @@ -582,15 +582,15 @@ } }, "wlsLDAPSSLCertificate": { - "defaultValue": "null", - "type": "string", + "defaultValue": "", + "type": "securestring", "metadata": { "description": "Client certificate that will be imported to trust store of SSL." } }, "wlsLDAPUserBaseDN": { - "defaultValue": "null", - "type": "string", + "defaultValue": "", + "type": "securestring", "metadata": { "description": "The base distinguished name (DN) of the tree in the LDAP directory that contains users." } @@ -1777,4 +1777,4 @@ "value": "[if(parameters('enableCustomDNS'), format('https://{0}.{1}:{2}',parameters('dnszoneLoadBalancerLabel'),parameters('dnszoneName'),parameters('ohshttpsPort')), reference('ohsLinkedTemplate', '${azure.apiVersion}').outputs.ohsSecureAccessURL.value)]" } } -} \ No newline at end of file +} diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_sslKeyVaultNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_sslKeyVaultNestedTemplate.json index eb2fb0ec2..303d5c417 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_sslKeyVaultNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/_sslKeyVaultNestedTemplate.json @@ -3,25 +3,26 @@ "contentVersion": "1.0.0.0", "parameters": { "uploadedCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Data" - } + }, + "defaultValue": "[newGuid()]" }, "uploadedCustomIdentityKeyStorePassphrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Passphrase" } }, "uploadedCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore Data" } }, "uploadedCustomTrustKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore PassPhrase" } @@ -33,7 +34,7 @@ } }, "uploadedPrivateKeyPassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Password of the private key" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json index a89584e29..dae5b8530 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json @@ -78,14 +78,14 @@ }, "wlsLDAPGroupBaseDN": { "defaultValue": "", - "type": "string", + "type": "securestring", "metadata": { "description": "The base distinguished name (DN) of the tree in the LDAP directory that contains groups." } }, "wlsLDAPPrincipal": { "defaultValue": "", - "type": "string", + "type": "securestring", "metadata": { "description": "The Distinguished Name (DN) of the LDAP user that WebLogic Server should use to connect to the LDAP server." } @@ -106,14 +106,14 @@ }, "wlsLDAPSSLCertificate": { "defaultValue": "", - "type": "string", + "type": "securestring", "metadata": { "description": "Client certificate that will be imported to trust store of SSL." } }, "wlsLDAPUserBaseDN": { "defaultValue": "", - "type": "string", + "type": "securestring", "metadata": { "description": "The base distinguished name (DN) of the tree in the LDAP directory that contains users." } @@ -139,8 +139,8 @@ } }, "keyVaultCustomTrustKeyStorePassPhrase": { - "type": "string", - "defaultValue": "null", + "type": "securestring", + "defaultValue": "", "metadata": { "description": "Weblogic Custom Trust Store Passphrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json index 2e1ff7afd..115c4645a 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json @@ -164,13 +164,13 @@ } }, "keyVaultCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Identity Keystore Data" } }, "keyVaultCustomIdentityKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Identity Keystore Passphrase" } @@ -183,13 +183,13 @@ "defaultValue": "JKS" }, "keyVaultCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Trust Store Data" } }, "keyVaultCustomTrustKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Trust Store Passphrase" } @@ -208,7 +208,7 @@ } }, "keyVaultPrivateKeyPassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Server Private Key Pass Phrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json index 3bd7b7b84..a01f9d1cd 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json @@ -198,15 +198,15 @@ } }, "keyVaultCustomIdentityKeyStoreData": { - "type": "string", - "defaultValue":"null", + "type": "securestring", + "defaultValue":"", "metadata": { "description": "Weblogic Custom Identity Keystore Data" } }, "keyVaultCustomIdentityKeyStorePassPhrase": { - "type": "string", - "defaultValue":"null", + "type": "securestring", + "defaultValue":"", "metadata": { "description": "Weblogic Custom Identity Keystore Passphrase" } @@ -219,15 +219,15 @@ "defaultValue": "JKS" }, "keyVaultCustomTrustKeyStoreData": { - "type": "string", - "defaultValue":"null", + "type": "securestring", + "defaultValue":"", "metadata": { "description": "Weblogic Custom Trust Store Data" } }, "keyVaultCustomTrustKeyStorePassPhrase": { - "type": "string", - "defaultValue":"null", + "type": "securestring", + "defaultValue":"", "metadata": { "description": "Weblogic Custom Trust Store Passphrase" } @@ -247,8 +247,8 @@ } }, "keyVaultPrivateKeyPassPhrase": { - "type": "string", - "defaultValue":"null", + "type": "securestring", + "defaultValue":"", "metadata": { "description": "Weblogic Server Private Key Pass Phrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json index 011a5888d..d837eec65 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json @@ -103,13 +103,13 @@ } }, "ohsSSLKeystoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "The name of the secret in the specified KeyVault whose value is the SSL Certificate Data" } }, "ohsSSLKeystorePassword": { - "type": "string", + "type": "securestring", "metadata": { "description": "The name of the secret in the specified KeyVault whose value is the password for the SSL Certificate" } @@ -145,7 +145,7 @@ } }, "oracleVaultPswd": { - "type": "string", + "type": "securestring", "metadata": { "description": "Password for Oracle Vault required for OHS SSL setup" } @@ -170,7 +170,7 @@ } }, "wlsPassword": { - "type": "string", + "type": "securestring", "metadata": { "description": "Provide WebLogic password" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh index a1494e37a..f49e27f59 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh @@ -256,7 +256,7 @@ function parseLDAPCertificate() done openssl base64 -d -in ${SCRIPT_PWD}/security/AzureADLDAPCerBase64String.txt -out ${SCRIPT_PWD}/security/AzureADTrust.cer - export addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer + addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer } function importAADCertificate() @@ -351,7 +351,7 @@ function wait_for_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=`curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}` echo "Check admin server status" while [[ "$status" != "200" ]] @@ -428,22 +428,22 @@ EOF function createTempFolder() { - export SCRIPT_PATH="/u01/tmp" + SCRIPT_PATH="/u01/tmp" sudo rm -f -r ${SCRIPT_PATH} sudo mkdir ${SCRIPT_PATH} sudo rm -rf $SCRIPT_PATH/* } -export LDAP_USER_NAME='sAMAccountName' -export LDAP_USER_FROM_NAME_FILTER='(&(sAMAccountName=%u)(objectclass=user))' -export JAVA_OPTIONS_TLS_V12="-Djdk.tls.client.protocols=TLSv1.2" -export STRING_ENABLE_TLSV12="Append -Djdk.tls.client.protocols to JAVA_OPTIONS in jdk8" -export WLS_CLUSTER_NAME="cluster1" -export WLS_DYNAMIC_SERVER_TEMPLATE="myServerTemplate" -export SCRIPT_PWD=`pwd` -export USER_ORACLE="oracle" -export GROUP_ORACLE="oracle" -export DOMAIN_PATH="/u01/domains" +LDAP_USER_NAME='sAMAccountName' +LDAP_USER_FROM_NAME_FILTER='(&(sAMAccountName=%u)(objectclass=user))' +JAVA_OPTIONS_TLS_V12="-Djdk.tls.client.protocols=TLSv1.2" +STRING_ENABLE_TLSV12="Append -Djdk.tls.client.protocols to JAVA_OPTIONS in jdk8" +WLS_CLUSTER_NAME="cluster1" +WLS_DYNAMIC_SERVER_TEMPLATE="myServerTemplate" +SCRIPT_PWD=`pwd` +USER_ORACLE="oracle" +GROUP_ORACLE="oracle" +DOMAIN_PATH="/u01/domains" if [ $# -ne 21 ] then @@ -451,29 +451,29 @@ then exit 1 fi -export wlsUserName=$1 -export wlsPassword=$2 -export wlsDomainName=$3 -export adProviderName=$4 -export adServerHost=$5 -export adServerPort=$6 -export adPrincipal=$7 -export adPassword=$8 -export adGroupBaseDN=$9 -export adUserBaseDN=${10} -export oracleHome=${11} -export wlsAdminHost=${12} -export wlsAdminPort=${13} -export wlsADSSLCer="${14}" -export wlsLDAPPublicIP="${15}" -export wlsAdminServerName=${16} -export wlsDomainPath=${17} -export isCustomSSLEnabled=${18} -export customTrustKeyStorePassPhrase="${19}" -export customTrustKeyStoreType="${20}" -export vmIndex=${21} - -export isCustomSSLEnabled="${isCustomSSLEnabled,,}" +wlsUserName=$1 +wlsPassword=$2 +wlsDomainName=$3 +adProviderName=$4 +adServerHost=$5 +adServerPort=$6 +adPrincipal=$7 +adPassword=$8 +adGroupBaseDN=$9 +adUserBaseDN=${10} +oracleHome=${11} +wlsAdminHost=${12} +wlsAdminPort=${13} +wlsADSSLCer="${14}" +wlsLDAPPublicIP="${15}" +wlsAdminServerName=${16} +wlsDomainPath=${17} +isCustomSSLEnabled=${18} +customTrustKeyStorePassPhrase="${19}" +customTrustKeyStoreType="${20}" +vmIndex=${21} + +isCustomSSLEnabled="${isCustomSSLEnabled,,}" if [ "${isCustomSSLEnabled,,}" == "true" ]; then @@ -481,7 +481,7 @@ then customTrustKeyStoreType=$(echo "$customTrustKeyStoreType" | base64 --decode) fi -export wlsAdminURL=$wlsAdminHost:$wlsAdminPort +wlsAdminURL=$wlsAdminHost:$wlsAdminPort if [ $vmIndex -eq 0 ]; then diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh index e5960f1c6..979818b03 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-oracle.sh @@ -2,18 +2,18 @@ # 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. # -export oracleHome=$1 -export wlsAdminHost=$2 -export wlsAdminPort=$3 -export wlsUserName=$4 -export wlsPassword=$5 -export jdbcDataSourceName=$6 -export dsConnectionURL=$7 -export dsUser=$8 -export dsPassword=$9 -export wlsClusterName=${10-cluster1} -export wlsAdminURL=$wlsAdminHost:$wlsAdminPort -export hostName=`hostname` +oracleHome=$1 +wlsAdminHost=$2 +wlsAdminPort=$3 +wlsUserName=$4 +wlsPassword=$5 +jdbcDataSourceName=$6 +dsConnectionURL=$7 +dsUser=$8 +dsPassword=$9 +wlsClusterName=${10-cluster1} +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` #Function to output message to StdErr function echo_stderr () @@ -139,7 +139,7 @@ EOF function createTempFolder() { - export scriptPath="/u01/tmp" + scriptPath="/u01/tmp" sudo rm -f -r ${scriptPath} sudo mkdir ${scriptPath} sudo rm -rf $scriptPath/* diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh index 8a85f0bfc..c79f396f5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-postgresql.sh @@ -2,18 +2,18 @@ # 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. # -export oracleHome=$1 -export wlsAdminHost=$2 -export wlsAdminPort=$3 -export wlsUserName=$4 -export wlsPassword=$5 -export jdbcDataSourceName=$6 -export dsConnectionURL=$7 -export dsUser=$8 -export dsPassword=$9 -export wlsClusterName=${10-cluster1} -export wlsAdminURL=$wlsAdminHost:$wlsAdminPort -export hostName=`hostname` +oracleHome=$1 +wlsAdminHost=$2 +wlsAdminPort=$3 +wlsUserName=$4 +wlsPassword=$5 +jdbcDataSourceName=$6 +dsConnectionURL=$7 +dsUser=$8 +dsPassword=$9 +wlsClusterName=${10-cluster1} +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` #Function to output message to StdErr function echo_stderr () @@ -139,7 +139,7 @@ EOF function createTempFolder() { - export scriptPath="/u01/tmp" + scriptPath="/u01/tmp" sudo rm -f -r ${scriptPath} sudo mkdir ${scriptPath} sudo rm -rf $scriptPath/* diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh index 239b018ce..68dd9c602 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/datasourceConfig-sqlserver.sh @@ -2,18 +2,18 @@ # 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. # -export oracleHome=$1 -export wlsAdminHost=$2 -export wlsAdminPort=$3 -export wlsUserName=$4 -export wlsPassword=$5 -export jdbcDataSourceName=$6 -export dsConnectionURL=$7 -export dsUser=$8 -export dsPassword=$9 -export wlsClusterName=${10-cluster1} -export wlsAdminURL=$wlsAdminHost:$wlsAdminPort -export hostName=`hostname` +oracleHome=$1 +wlsAdminHost=$2 +wlsAdminPort=$3 +wlsUserName=$4 +wlsPassword=$5 +jdbcDataSourceName=$6 +dsConnectionURL=$7 +dsUser=$8 +dsPassword=$9 +wlsClusterName=${10-cluster1} +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` #Function to output message to StdErr function echo_stderr () @@ -139,7 +139,7 @@ EOF function createTempFolder() { - export scriptPath="/u01/tmp" + scriptPath="/u01/tmp" sudo rm -f -r ${scriptPath} sudo mkdir ${scriptPath} sudo rm -rf $scriptPath/* diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh index 7b91b7280..511fe114a 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForConfiguredCluster.sh @@ -623,7 +623,7 @@ EOF function wait_for_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) echo "Check admin server status" while [[ "$status" != "200" ]]; do @@ -647,7 +647,7 @@ function wait_for_admin() { function shutdown_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) echo "Check admin server status" while [[ "$status" == "200" ]]; do @@ -676,7 +676,7 @@ function cleanup() { function create_temp_folder() { - export SCRIPT_PATH="/u01/tmp" + SCRIPT_PATH="/u01/tmp" sudo rm -f -r ${SCRIPT_PATH} sudo mkdir ${SCRIPT_PATH} sudo rm -rf $SCRIPT_PATH/* @@ -719,7 +719,7 @@ function validate_elastic_server() # main script starts from here -export SCRIPT_PWD=$(pwd) +SCRIPT_PWD=$(pwd) # store arguments in a special array args=("$@") @@ -732,24 +732,24 @@ for ((i = 0; i < $ELEMENTS; i++)); do echo "ARG[${args[${i}]}]" done -export oracleHome=$1 -export wlsAdminURL=$2 -export wlsUserName=$3 -export wlsPassword=$4 -export wlsAdminServerName=$5 -export elasticURI=$6 -export elasticUserName=$7 -export elasticPassword=$8 -export wlsDomainName=$9 -export wlsDomainPath=${10} -export logsToIntegrate=${11} -export index=${12} -export logIndex=${13} -export managedServerPrefix=${14} - -export hostName=$(hostname) -export userOracle="oracle" -export groupOracle="oracle" +oracleHome=$1 +wlsAdminURL=$2 +wlsUserName=$3 +wlsPassword=$4 +wlsAdminServerName=$5 +elasticURI=$6 +elasticUserName=$7 +elasticPassword=$8 +wlsDomainName=$9 +wlsDomainPath=${10} +logsToIntegrate=${11} +index=${12} +logIndex=${13} +managedServerPrefix=${14} + +hostName=$(hostname) +userOracle="oracle" +groupOracle="oracle" if [ $# -ne 14 ]; then usage diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh index 3c1cd12db..d0cc18fba 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/elkIntegrationForDynamicCluster.sh @@ -797,7 +797,7 @@ EOF function wait_for_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) echo "Check admin server status" while [[ "$status" != "200" ]]; do @@ -821,7 +821,7 @@ function wait_for_admin() { function shutdown_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) echo "Check admin server status" while [[ "$status" == "200" ]]; do @@ -850,7 +850,7 @@ function cleanup() { function create_temp_folder() { - export SCRIPT_PATH="/u01/tmp" + SCRIPT_PATH="/u01/tmp" sudo rm -f -r ${SCRIPT_PATH} sudo mkdir ${SCRIPT_PATH} sudo rm -rf $SCRIPT_PATH/* @@ -893,34 +893,34 @@ function validate_elastic_server() #main script starts here -export SCRIPT_PWD=$(pwd) +SCRIPT_PWD=$(pwd) if [ $# -ne 15 ]; then usage exit 1 fi -export oracleHome=$1 -export wlsAdminURL=$2 -export managedServerPrefix=$3 -export wlsUserName=$4 -export wlsPassword=$5 -export wlsAdminServerName=$6 -export elasticURI=$7 -export elasticUserName=$8 -export elasticPassword=$9 -export wlsDomainName=${10} -export wlsDomainPath=${11} -export logsToIntegrate=${12} -export index=${13} -export logIndex=${14} -export maxDynamicClusterSize=${15} - -export hostName=$(hostname) -export userOracle="oracle" -export groupOracle="oracle" -export clusterName="cluster1" -export serverTemplate="myServerTemplate" +oracleHome=$1 +wlsAdminURL=$2 +managedServerPrefix=$3 +wlsUserName=$4 +wlsPassword=$5 +wlsAdminServerName=$6 +elasticURI=$7 +elasticUserName=$8 +elasticPassword=$9 +wlsDomainName=${10} +wlsDomainPath=${11} +logsToIntegrate=${12} +index=${13} +logIndex=${14} +maxDynamicClusterSize=${15} + +hostName=$(hostname) +userOracle="oracle" +groupOracle="oracle" +clusterName="cluster1" +serverTemplate="myServerTemplate" create_temp_folder validate_input diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh index 45fa781ee..c3906c723 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh @@ -325,7 +325,7 @@ EOF function wait_for_admin() { #check admin server status count=1 - export CHECK_URL="http://$wlsAdminURL/weblogic/ready" + CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=$(curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) echo "Check admin server status" while [[ "$status" != "200" ]]; do @@ -573,8 +573,8 @@ function storeCustomSSLCerts() mkdir -p $KEYSTORE_PATH echo "Custom SSL is enabled. Storing CertInfo as files..." - export customIdentityKeyStoreFileName="$KEYSTORE_PATH/identity.keystore" - export customTrustKeyStoreFileName="$KEYSTORE_PATH/trust.keystore" + customIdentityKeyStoreFileName="$KEYSTORE_PATH/identity.keystore" + customTrustKeyStoreFileName="$KEYSTORE_PATH/trust.keystore" customIdentityKeyStoreData=$(echo "$customIdentityKeyStoreData" | base64 --decode) customIdentityKeyStorePassPhrase=$(echo "$customIdentityKeyStorePassPhrase" | base64 --decode) @@ -600,7 +600,7 @@ function storeCustomSSLCerts() # main script starts from here -export SCRIPT_PWD=$(pwd) +SCRIPT_PWD=$(pwd) # store arguments in a special array args=("$@") @@ -618,61 +618,61 @@ if [ $# -lt 19 ]; then exit 1 fi -export wlsDomainName=$1 -export wlsUserName=$2 -export wlsPassword=$3 -export adminVMName=$4 -export oracleHome=$5 -export wlsDomainPath=$6 -export storageAccountName=$7 -export storageAccountKey=$8 -export mountpointPath=$9 -export enableWebLocalStorage=${10} -export enableELK=${11} -export elasticURI=${12} -export elasticUserName=${13} -export elasticPassword=${14} -export logsToIntegrate=${15} -export logIndex=${16} -export managedServerPrefix=${17} -export serverIndex=${18} - -export isCustomSSLEnabled="${19}" +wlsDomainName=$1 +wlsUserName=$2 +wlsPassword=$3 +adminVMName=$4 +oracleHome=$5 +wlsDomainPath=$6 +storageAccountName=$7 +storageAccountKey=$8 +mountpointPath=$9 +enableWebLocalStorage=${10} +enableELK=${11} +elasticURI=${12} +elasticUserName=${13} +elasticPassword=${14} +logsToIntegrate=${15} +logIndex=${16} +managedServerPrefix=${17} +serverIndex=${18} + +isCustomSSLEnabled="${19}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" #case insensitive check if [ "${isCustomSSLEnabled}" == "true" ]; then echo "custom ssl enabled. Reading keystore information" - export customIdentityKeyStoreData="${20}" - export customIdentityKeyStorePassPhrase="${21}" - export customIdentityKeyStoreType="${22}" - export customTrustKeyStoreData="${23}" - export customTrustKeyStorePassPhrase="${24}" - export customTrustKeyStoreType="${25}" - export serverPrivateKeyAlias="${26}" - export serverPrivateKeyPassPhrase="${27}" + customIdentityKeyStoreData="${20}" + customIdentityKeyStorePassPhrase="${21}" + customIdentityKeyStoreType="${22}" + customTrustKeyStoreData="${23}" + customTrustKeyStorePassPhrase="${24}" + customTrustKeyStoreType="${25}" + serverPrivateKeyAlias="${26}" + serverPrivateKeyPassPhrase="${27}" else isCustomSSLEnabled="false" fi -export clientClusterName="cluster1" -export coherenceClusterName="myCoherence" -export coherenceListenPort=7574 -export coherenceLocalport=42000 -export coherenceLocalportAdjust=42200 -export groupname="oracle" -export nmHost=$(hostname) -export nmPort=5556 -export storageClusterName="storage1" -export storageListenPort=7501 -export weblogicDeployTool=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip -export username="oracle" -export wlsAdminT3ChannelPort=7005 -export wlsAdminURL="${adminVMName}:${wlsAdminT3ChannelPort}" -export wlsCoherenceUnicastPortRange="-Dcoherence.localport=$coherenceLocalport -Dcoherence.localport.adjust=$coherenceLocalportAdjust" -export wlsServerTemplate="myServerTemplate" -export KEYSTORE_PATH="${wlsDomainPath}/${wlsDomainName}/keystores" +clientClusterName="cluster1" +coherenceClusterName="myCoherence" +coherenceListenPort=7574 +coherenceLocalport=42000 +coherenceLocalportAdjust=42200 +groupname="oracle" +nmHost=$(hostname) +nmPort=5556 +storageClusterName="storage1" +storageListenPort=7501 +weblogicDeployTool=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip +username="oracle" +wlsAdminT3ChannelPort=7005 +wlsAdminURL="${adminVMName}:${wlsAdminT3ChannelPort}" +wlsCoherenceUnicastPortRange="-Dcoherence.localport=$coherenceLocalport -Dcoherence.localport.adjust=$coherenceLocalportAdjust" +wlsServerTemplate="myServerTemplate" +KEYSTORE_PATH="${wlsDomainPath}/${wlsDomainName}/keystores" if [ ${serverIndex} -eq 0 ]; then wlsServerName="admin" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh index c0ba8d396..7070f34b9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh @@ -420,7 +420,7 @@ function wait_for_admin() { #wait for admin to start count=1 -export CHECK_URL="http://$wlsAdminURL/weblogic/ready" +CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=`curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}` while [[ "$status" != "200" ]] do @@ -776,8 +776,8 @@ function storeCustomSSLCerts() mkdir -p $KEYSTORE_PATH echo "Custom SSL is enabled. Storing CertInfo as files..." - export customIdentityKeyStoreFileName="$KEYSTORE_PATH/identity.keystore" - export customTrustKeyStoreFileName="$KEYSTORE_PATH/trust.keystore" + customIdentityKeyStoreFileName="$KEYSTORE_PATH/identity.keystore" + customTrustKeyStoreFileName="$KEYSTORE_PATH/trust.keystore" customIdentityKeyStoreData=$(echo "$customIdentityKeyStoreData" | base64 --decode) customIdentityKeyStorePassPhrase=$(echo "$customIdentityKeyStorePassPhrase" | base64 --decode) @@ -805,7 +805,7 @@ function storeCustomSSLCerts() #main script starts here CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export BASE_DIR="$(readlink -f ${CURR_DIR})" +BASE_DIR="$(readlink -f ${CURR_DIR})" # store arguments in a special array args=("$@") @@ -814,9 +814,9 @@ ELEMENTS=${#args[@]} # echo each element in array # for loop -for (( i=0;i<$ELEMENTS;i++)); do - echo "ARG[${args[${i}]}]" -done +#for (( i=0;i<$ELEMENTS;i++)); do +# echo "ARG[${args[${i}]}]" +#done if [ $# -lt 15 ] then @@ -824,88 +824,88 @@ then exit 1 fi -export wlsDomainName=${1} -export wlsUserName=${2} -export wlsPassword=${3} -export managedServerPrefix=${4} -export indexValue=${5} -export vmNamePrefix=${6} -export maxDynamicClusterSize=${7} -export dynamicClusterSize=${8} -export adminVMName=${9} -export oracleHome=${10} -export storageAccountName=${11} -export storageAccountKey=${12} -export mountpointPath=${13} - -export DOMAIN_PATH="/u01/domains" -export startWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/startWebLogic.sh" -export stopWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/bin/customStopWebLogic.sh" - -export isHTTPAdminListenPortEnabled="${14}" +wlsDomainName=${1} +wlsUserName=${2} +wlsPassword=${3} +managedServerPrefix=${4} +indexValue=${5} +vmNamePrefix=${6} +maxDynamicClusterSize=${7} +dynamicClusterSize=${8} +adminVMName=${9} +oracleHome=${10} +storageAccountName=${11} +storageAccountKey=${12} +mountpointPath=${13} + +DOMAIN_PATH="/u01/domains" +startWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/startWebLogic.sh" +stopWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/bin/customStopWebLogic.sh" + +isHTTPAdminListenPortEnabled="${14}" isHTTPAdminListenPortEnabled="${isHTTPAdminListenPortEnabled,,}" -export isCustomSSLEnabled="${15}" +isCustomSSLEnabled="${15}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" #case insensitive check if [ "${isCustomSSLEnabled}" == "true" ]; then echo "custom ssl enabled. Reading keystore information" - export customIdentityKeyStoreData="${16}" - export customIdentityKeyStorePassPhrase="${17}" - export customIdentityKeyStoreType="${18}" - export customTrustKeyStoreData="${19}" - export customTrustKeyStorePassPhrase="${20}" - export customTrustKeyStoreType="${21}" - export serverPrivateKeyAlias="${22}" - export serverPrivateKeyPassPhrase="${23}" + customIdentityKeyStoreData="${16}" + customIdentityKeyStorePassPhrase="${17}" + customIdentityKeyStoreType="${18}" + customTrustKeyStoreData="${19}" + customTrustKeyStorePassPhrase="${20}" + customTrustKeyStoreType="${21}" + serverPrivateKeyAlias="${22}" + serverPrivateKeyPassPhrase="${23}" else isCustomSSLEnabled="false" fi # Always index 0 is set as admin server -export coherenceListenPort=7574 -export coherenceLocalport=42000 -export coherenceLocalportAdjust=42200 -export wlsAdminPort=7001 -export wlsSSLAdminPort=7002 -export wlsAdminT3ChannelPort=7005 -export wlsManagedPort=8001 - -export wlsAdminURL="$adminVMName:$wlsAdminT3ChannelPort" -export SERVER_START_URL="http://$wlsAdminURL" -export KEYSTORE_PATH="${DOMAIN_PATH}/${wlsDomainName}/keystores" +coherenceListenPort=7574 +coherenceLocalport=42000 +coherenceLocalportAdjust=42200 +wlsAdminPort=7001 +wlsSSLAdminPort=7002 +wlsAdminT3ChannelPort=7005 +wlsManagedPort=8001 + +wlsAdminURL="$adminVMName:$wlsAdminT3ChannelPort" +SERVER_START_URL="http://$wlsAdminURL" +KEYSTORE_PATH="${DOMAIN_PATH}/${wlsDomainName}/keystores" if [ "${isCustomSSLEnabled}" == "true" ]; then SERVER_START_URL="https://$adminVMName:$wlsSSLAdminPort" fi -export CHECK_URL="http://$wlsAdminURL/weblogic/ready" -export adminWlstURL="t3://$wlsAdminURL" +CHECK_URL="http://$wlsAdminURL/weblogic/ready" +adminWlstURL="t3://$wlsAdminURL" -export wlsClusterName="cluster1" -export dynamicServerTemplate="myServerTemplate" -export nmHost=`hostname` -export nmPort=5556 -export machineNamePrefix="machine" -export machineName="$machineNamePrefix-$nmHost" -export WEBLOGIC_DEPLOY_TOOL=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip -export username="oracle" -export groupname="oracle" +wlsClusterName="cluster1" +dynamicServerTemplate="myServerTemplate" +nmHost=`hostname` +nmPort=5556 +machineNamePrefix="machine" +machineName="$machineNamePrefix-$nmHost" +WEBLOGIC_DEPLOY_TOOL=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip +username="oracle" +groupname="oracle" validateInput if [ $indexValue == 0 ]; then - export wlsServerName="admin" + wlsServerName="admin" else serverIndex=$indexValue - export wlsServerName="$managedServerPrefix$serverIndex" + wlsServerName="$managedServerPrefix$serverIndex" fi -export SCRIPT_PWD=`pwd` +SCRIPT_PWD=`pwd` cleanup installUtilities diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh index b3e930f62..be04a5f10 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh @@ -154,7 +154,7 @@ function createOHSTemplates() sudo cp $BASE_DIR/$OHS_FILE_NAME $OHS_PATH/$OHS_FILE_NAME echo "unzipping $OHS_FILE_NAME" sudo unzip -o $OHS_PATH/$OHS_FILE_NAME -d $OHS_PATH - export SILENT_FILES_DIR=$OHS_PATH/silent-template + SILENT_FILES_DIR=$OHS_PATH/silent-template sudo mkdir -p $SILENT_FILES_DIR sudo rm -rf $OHS_PATH/silent-template/* mkdir -p $INSTALL_PATH @@ -309,8 +309,6 @@ function enableAndStartOHSServerService() function getWLSClusterAddress() { restArgs=" -v --user ${WLS_USER}:${WLS_PASSWORD} -H X-Requested-By:MyClient -H Accept:application/json -H Content-Type:application/json" - echo $restArgs - echo curl $restArgs -X GET ${WLS_REST_URL}/domainRuntime/serverRuntimes?fields=defaultURL > out curl $restArgs -X GET ${WLS_REST_URL}/domainRuntime/serverRuntimes?fields=defaultURL > out if [[ $? != 0 ]]; then @@ -322,7 +320,7 @@ function getWLSClusterAddress() # Exclude coherence server listen port 7501 msString=` cat out | grep defaultURL | grep -v "7001\|7005\|7501" | cut -f3 -d"/" ` wlsClusterAddress=`echo $msString | sed 's/\" /,/g'` - export WLS_CLUSTER_ADDRESS=${wlsClusterAddress::-1} + WLS_CLUSTER_ADDRESS=${wlsClusterAddress::-1} # Test whether servers are reachable testClusterServers=$(echo ${WLS_CLUSTER_ADDRESS} | tr "," "\n") @@ -472,32 +470,32 @@ function verifyService() # Execution starts here CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export BASE_DIR="$(readlink -f ${CURR_DIR})" - -export OHS_DOMAIN_NAME=$1 -export OHS_COMPONENT_NAME=$2 -export OHS_NM_USER=$3 -export OHS_NM_PSWD=$4 -export OHS_HTTP_PORT=$5 -export OHS_HTTPS_PORT=$6 -export WLS_REST_URL=$7 -export WLS_USER=$8 -export WLS_PASSWORD=$9 -export OHS_KEY_STORE_DATA=${10} -export OHS_KEY_STORE_PASSPHRASE=${11} -export ORACLE_VAULT_PASSWORD=${12} -export OHS_KEY_TYPE=${13} -export JDK_PATH="/u01/app/jdk" -export JDK_VERSION="jdk1.8.0_271" -export JAVA_HOME=$JDK_PATH/$JDK_VERSION -export PATH=$JAVA_HOME/bin:$PATH -export OHS_PATH="/u01/app/ohs" -export DOMAIN_PATH="/u01/domains" -export INSTALL_PATH="$OHS_PATH/install" -export OHS_DOMAIN_PATH=${DOMAIN_PATH}/${OHS_DOMAIN_NAME} -export OHS_VAULT_PATH="${DOMAIN_PATH}/ohsvault" -export groupname="oracle" -export username="oracle" +BASE_DIR="$(readlink -f ${CURR_DIR})" + +OHS_DOMAIN_NAME=$1 +OHS_COMPONENT_NAME=$2 +OHS_NM_USER=$3 +OHS_NM_PSWD=$4 +OHS_HTTP_PORT=$5 +OHS_HTTPS_PORT=$6 +WLS_REST_URL=$7 +WLS_USER=$8 +WLS_PASSWORD=$9 +OHS_KEY_STORE_DATA=${10} +OHS_KEY_STORE_PASSPHRASE=${11} +ORACLE_VAULT_PASSWORD=${12} +OHS_KEY_TYPE=${13} +JDK_PATH="/u01/app/jdk" +JDK_VERSION="jdk1.8.0_271" +JAVA_HOME=$JDK_PATH/$JDK_VERSION +PATH=$JAVA_HOME/bin:$PATH +OHS_PATH="/u01/app/ohs" +DOMAIN_PATH="/u01/domains" +INSTALL_PATH="$OHS_PATH/install" +OHS_DOMAIN_PATH=${DOMAIN_PATH}/${OHS_DOMAIN_NAME} +OHS_VAULT_PATH="${DOMAIN_PATH}/ohsvault" +groupname="oracle" +username="oracle" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh index 576006457..a8d38e1f8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/updateDNSZones.sh @@ -3,17 +3,17 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # -export resourceGroup=$1 -export zoneName=$2 -export recordSetNames=$3 -export targetResources=$4 -export lenRecordset=$5 -export lenTargets=$6 -export ttl=${7} -export cnameRecordSetNames=${8} -export cnameAlias=${9} -export lenCnameRecordSetNames=${10} -export lenCnameAlias=${11} +resourceGroup=$1 +zoneName=$2 +recordSetNames=$3 +targetResources=$4 +lenRecordset=$5 +lenTargets=$6 +ttl=${7} +cnameRecordSetNames=${8} +cnameAlias=${9} +lenCnameRecordSetNames=${10} +lenCnameAlias=${11} if [[ ${lenRecordset} != ${lenTargets} ]]; then echo "Error: number of A record set names is not equal to that of target resources." diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh index 326585697..f81a2cd08 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad-ag.sh @@ -61,6 +61,9 @@ cat < ${parametersPath} "dynamicClusterSize": { "value": 2 }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsLDAPGroupBaseDN": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh index a670f880d..bc773b301 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-aad.sh @@ -45,6 +45,9 @@ cat < ${parametersPath} "dynamicClusterSize": { "value": 2 }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsLDAPGroupBaseDN": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh index f212acc57..97bc1a05a 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-coherence.sh @@ -31,6 +31,9 @@ cat <${parametersPath} "enableCoherence": { "value": true }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh index de65a2f83..35ef2e5ba 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db-aad.sh @@ -61,6 +61,9 @@ cat < ${parametersPath} "dynamicClusterSize": { "value": 2 }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsLDAPGroupBaseDN": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh index 42feff3e6..815d374fd 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-db.sh @@ -51,6 +51,9 @@ cat < ${parametersPath} "dynamicClusterSize": { "value": 2 }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh index e8872b867..23ef39650 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh @@ -45,6 +45,9 @@ cat < ${parametersPath} "storageAccountName": { "value": "${storageAccountName}" }, + "vmSizeSelectForCoherence": { + "value": "Standard_D2as_v4" + }, "wlsDomainName": { "value": "${wlsDomainName}" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh index fc7369972..09ce803a6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-addnode.sh @@ -47,6 +47,9 @@ cat < ${parametersPath} "storageAccountName": { "value": "${storageAccountName}" }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsDomainName": { "value": "${wlsDomainName}" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh index 83a6c131b..2a0e895d8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy-coherence.sh @@ -40,6 +40,9 @@ cat < ${parametersPath} "storageAccountName": { "value": "${storageAccountName}" }, + "vmSizeSelectForCoherence": { + "value": "Standard_D2as_v4" + }, "wlsDomainName": { "value": "${wlsDomainName}" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh index 441aff433..2342ac091 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-deploy.sh @@ -54,7 +54,7 @@ cat <${parametersPath} "value": "$adminvmname" }, "vmSizeSelect": { - "value": "Standard_A3" + "value": "Standard_D2as_v4" }, "location": { "value": "$location" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh index 1b2552135..c5f8d1f5d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters-elk.sh @@ -42,6 +42,9 @@ cat <${parametersPath} "enableELK": { "value": true }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh index f7bae2e7a..52f1974b2 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/test/scripts/gen-parameters.sh @@ -35,7 +35,10 @@ cat < ${parametersPath} }, "dynamicClusterSize": { "value": 2 - }, + }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, From 16682448157ba6eee7f27d12f351debfd0eef6ed Mon Sep 17 00:00:00 2001 From: Sanjay Mantoor Date: Mon, 5 Jul 2021 12:56:05 +0000 Subject: [PATCH 2/2] Updated script files for admin --- .../main/scripts/configureCustomAdminSSL.sh | 64 +++++++++---------- .../cli-scripts/custom-dns-alias-cli.sh | 8 +-- .../src/main/arm/mainTemplate.json | 8 +-- .../_keyVaultNestedTemplate.json | 10 +-- .../nestedtemplates/aadNestedTemplate.json | 10 +-- .../adminTemplateForCustomSSL.json | 10 +-- .../test/data/parameters-test.json | 2 +- .../test/scripts/gen-parameters-aad.sh | 3 + .../test/scripts/gen-parameters-db-aad.sh | 3 + .../test/scripts/gen-parameters-db.sh | 3 + .../test/scripts/gen-parameters-elk.sh | 3 + .../test/scripts/gen-parameters.sh | 3 + 12 files changed, 71 insertions(+), 56 deletions(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh index e8036e38d..1a238e217 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh @@ -154,7 +154,7 @@ function wait_for_admin() { #wait for admin to start count=1 -export CHECK_URL="http://$wlsAdminURL/weblogic/ready" +CHECK_URL="http://$wlsAdminURL/weblogic/ready" status=`curl --insecure -ILs $CHECK_URL | tac | grep -m1 HTTP/1.1 | awk {'print $2'}` echo "Waiting for admin server to start" while [[ "$status" != "200" ]] @@ -193,7 +193,7 @@ function parseLDAPCertificate() done openssl base64 -d -in ${SCRIPT_PWD}/security/AzureADLDAPCerBase64String.txt -out ${SCRIPT_PWD}/security/AzureADTrust.cer - export addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer + addsCertificate=${SCRIPT_PWD}/security/AzureADTrust.cer } function importAADCertificateIntoWLSCustomTrustKeyStore() @@ -254,7 +254,7 @@ function parseAndSaveCustomSSLKeyStoreData() echo "$customIdentityKeyStoreBase64String" > ${KEYSTORE_PATH}/identityKeyStoreCerBase64String.txt cat ${KEYSTORE_PATH}/identityKeyStoreCerBase64String.txt | base64 -d > ${KEYSTORE_PATH}/identity.keystore - export customSSLIdentityKeyStoreFile=${KEYSTORE_PATH}/identity.keystore + customSSLIdentityKeyStoreFile=${KEYSTORE_PATH}/identity.keystore rm -rf ${KEYSTORE_PATH}/identityKeyStoreCerBase64String.txt @@ -263,7 +263,7 @@ function parseAndSaveCustomSSLKeyStoreData() echo "$customTrustKeyStoreBase64String" > ${KEYSTORE_PATH}/trustKeyStoreCerBase64String.txt cat ${KEYSTORE_PATH}/trustKeyStoreCerBase64String.txt | base64 -d > ${KEYSTORE_PATH}/trust.keystore - export customSSLTrustKeyStoreFile=${KEYSTORE_PATH}/trust.keystore + customSSLTrustKeyStoreFile=${KEYSTORE_PATH}/trust.keystore rm -rf ${KEYSTORE_PATH}/trustKeyStoreCerBase64String.txt @@ -279,7 +279,7 @@ function restartAdminServerService() #main script starts here -export SCRIPT_PWD=`pwd` +SCRIPT_PWD=`pwd` # store arguments in a special array args=("$@") @@ -288,9 +288,9 @@ ELEMENTS=${#args[@]} # echo each element in array # for loop -for (( i=0;i<$ELEMENTS;i++)); do - echo "ARG[${args[${i}]}]" -done +#for (( i=0;i<$ELEMENTS;i++)); do +# echo "ARG[${args[${i}]}]" +#done if [ $# -lt 9 ] then @@ -298,41 +298,41 @@ then exit 1 fi -export adminVMName=$1 -export wlsDomainName=$2 -export wlsUserName=$3 -export wlsPassword=$4 -export oracleHome=$5 -export wlsDomainPath=$6 +adminVMName=$1 +wlsDomainName=$2 +wlsUserName=$3 +wlsPassword=$4 +oracleHome=$5 +wlsDomainPath=$6 -export enableAAD="${7}" +enableAAD="${7}" enableAAD="${enableAAD,,}" -export wlsADSSLCer="${8}" +wlsADSSLCer="${8}" -export isCustomSSLEnabled="${9}" +isCustomSSLEnabled="${9}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" if [ "${isCustomSSLEnabled,,}" == "true" ]; then - export customIdentityKeyStoreBase64String="${10}" - export customIdentityKeyStorePassPhrase="${11}" - export customIdentityKeyStoreType="${12}" - export customTrustKeyStoreBase64String="${13}" - export customTrustKeyStorePassPhrase="${14}" - export customTrustKeyStoreType="${15}" - export privateKeyAlias="${16}" - export privateKeyPassPhrase="${17}" + customIdentityKeyStoreBase64String="${10}" + customIdentityKeyStorePassPhrase="${11}" + customIdentityKeyStoreType="${12}" + customTrustKeyStoreBase64String="${13}" + customTrustKeyStorePassPhrase="${14}" + customTrustKeyStoreType="${15}" + privateKeyAlias="${16}" + privateKeyPassPhrase="${17}" fi -export wlsAdminPort=7001 -export wlsAdminChannelPort=7005 -export wlsAdminURL="$adminVMName:$wlsAdminChannelPort" -export wlsServerName="admin" -export username="oracle" -export groupname="oracle" +wlsAdminPort=7001 +wlsAdminChannelPort=7005 +wlsAdminURL="$adminVMName:$wlsAdminChannelPort" +wlsServerName="admin" +username="oracle" +groupname="oracle" -export KEYSTORE_PATH="$wlsDomainPath/$wlsDomainName/keystores" +KEYSTORE_PATH="$wlsDomainPath/$wlsDomainName/keystores" validateInput cleanup diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/cli-scripts/custom-dns-alias-cli.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/cli-scripts/custom-dns-alias-cli.sh index 2a10a0ed6..43bd392fb 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/cli-scripts/custom-dns-alias-cli.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/cli-scripts/custom-dns-alias-cli.sh @@ -107,7 +107,7 @@ function queryAdminIPId() { exit 1 fi - export adminIPId=$(az graph query -q "Resources + adminIPId=$(az graph query -q "Resources | where type =~ 'microsoft.network/networkinterfaces' | where id=~ '${nicId}' | extend ipConfigsCount=array_length(properties.ipConfigurations) @@ -122,7 +122,7 @@ function queryAdminIPId() { } function generateParameterFile() { - export parametersPath=parameters.json + parametersPath=parameters.json cat <${scriptDir}/${parametersPath} { "\$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", @@ -230,8 +230,8 @@ Custom DNS alias: # main script start from here # default value -export hasDNSZone=false -export identity=/subscriptions/subscriptionId/resourceGroups/TestResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/TestUserIdentity1 +hasDNSZone=false +identity=/subscriptions/subscriptionId/resourceGroups/TestResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/TestUserIdentity1 # Transform long options to short ones for arg in "$@"; do diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json index a3f21eeb0..43d71e9f8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json @@ -303,11 +303,11 @@ "defaultValue": "ServerPrivateKeyPassPhraseSecret" }, "uploadedCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Data" }, - "defaultValue": "customIdentityKeyStoreData" + "defaultValue": "" }, "uploadedCustomIdentityKeyStorePassphrase": { "type": "securestring", @@ -324,11 +324,11 @@ "defaultValue": "JKS" }, "uploadedCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore Data" }, - "defaultValue": "customTrustKeyStoreData" + "defaultValue": "" }, "uploadedCustomTrustKeyStorePassPhrase": { "type": "securestring", diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json index 69cc4231f..56bdb2c85 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json @@ -3,25 +3,25 @@ "contentVersion": "1.0.0.0", "parameters": { "uploadedCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Data" } }, "uploadedCustomIdentityKeyStorePassphrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Identity KeyStore Passphrase" } }, "uploadedCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore Data" } }, "uploadedCustomTrustKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Custom Trust KeyStore PassPhrase" } @@ -33,7 +33,7 @@ } }, "uploadedPrivateKeyPassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Password of the private key" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json index a9f83a0f4..8b641f517 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json @@ -67,7 +67,7 @@ } }, "wlsLDAPPrincipal": { - "type": "string", + "type": "securestring", "defaultValue": "", "metadata": { "description": "The Distinguished Name (DN) of the LDAP user that WebLogic Server should use to connect to the LDAP server." @@ -88,14 +88,14 @@ } }, "wlsLDAPSSLCertificate": { - "type": "string", + "type": "securestring", "defaultValue": "", "metadata": { "description": "Client certificate that will be imported to trust store of SSL." } }, "wlsLDAPUserBaseDN": { - "type": "string", + "type": "securestring", "defaultValue": "", "metadata": { "description": "The base distinguished name (DN) of the tree in the LDAP directory that contains users." @@ -121,8 +121,8 @@ } }, "keyVaultCustomTrustKeyStorePassPhrase": { - "type": "string", - "defaultValue": "null", + "type": "securestring", + "defaultValue": "", "metadata": { "description": "Weblogic Custom Trust Store Passphrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json index 5c83560cd..ed331f2ee 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json @@ -90,13 +90,13 @@ "defaultValue": "[newGuid()]" }, "keyVaultCustomIdentityKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Identity Keystore Data" } }, "keyVaultCustomIdentityKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Identity Keystore Passphrase" } @@ -109,13 +109,13 @@ "defaultValue": "JKS" }, "keyVaultCustomTrustKeyStoreData": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Trust Store Data" } }, "keyVaultCustomTrustKeyStorePassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Custom Trust Store Passphrase" } @@ -134,7 +134,7 @@ } }, "keyVaultPrivateKeyPassPhrase": { - "type": "string", + "type": "securestring", "metadata": { "description": "Weblogic Server Private Key Pass Phrase" } diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/data/parameters-test.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/data/parameters-test.json index f18566e3a..fcee237ce 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/data/parameters-test.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/data/parameters-test.json @@ -24,7 +24,7 @@ "value": "#adminvmname#" }, "vmSizeSelect": { - "value": "Standard_A3" + "value": "Standard_D2as_v4" }, "location": { "value": "#location#" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-aad.sh index 7523392b9..dd25e0da8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-aad.sh @@ -38,6 +38,9 @@ cat < ${parametersPath} "enableDB": { "value": false }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsLDAPGroupBaseDN": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db-aad.sh index e6b4c4372..d1c986587 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db-aad.sh @@ -53,6 +53,9 @@ cat < ${parametersPath} "jdbcDataSourceName": { "value": "jdbc/postgresql" }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsLDAPGroupBaseDN": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db.sh index 1d83bb398..5540e4f3e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-db.sh @@ -44,6 +44,9 @@ cat < ${parametersPath} "jdbcDataSourceName": { "value": "jdbc/postgresql" }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-elk.sh index 09021fc20..a22ba17cf 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-elk.sh @@ -41,6 +41,9 @@ cat <${parametersPath} "enableELK": { "value": true }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters.sh index f29eb1cd7..b65414b55 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters.sh @@ -29,6 +29,9 @@ cat < ${parametersPath} "enableDB": { "value": false }, + "vmSizeSelect": { + "value": "Standard_D2as_v4" + }, "wlsPassword": { "value": "GEN-UNIQUE" },