diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json index fa6b94468..d59f63ea9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/arm/mainTemplate.json @@ -121,7 +121,8 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('adminVMName'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('aadsSettings').enable,' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ', parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'))]" } + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('adminVMName'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('aadsSettings').enable,' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ', parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'),'\"')]" + } } }, { 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 1a238e217..8679b448f 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 @@ -11,7 +11,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configureCustomAdminSSL.sh " + echo_stderr "./configureCustomAdminSSL.sh <<< \"\"" } function installUtilities() @@ -285,46 +285,14 @@ SCRIPT_PWD=`pwd` args=("$@") # get number of elements ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -#for (( i=0;i<$ELEMENTS;i++)); do -# echo "ARG[${args[${i}]}]" -#done - -if [ $# -lt 9 ] -then - usage - exit 1 -fi - -adminVMName=$1 -wlsDomainName=$2 -wlsUserName=$3 -wlsPassword=$4 -oracleHome=$5 -wlsDomainPath=$6 -enableAAD="${7}" -enableAAD="${enableAAD,,}" +#read arguments from stdin +read adminVMName wlsDomainName wlsUserName wlsPassword oracleHome wlsDomainPath enableAAD wlsADSSLCer isCustomSSLEnabled customIdentityKeyStoreBase64String customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreBase64String customTrustKeyStorePassPhrase customTrustKeyStoreType privateKeyAlias privateKeyPassPhrase -wlsADSSLCer="${8}" -isCustomSSLEnabled="${9}" +enableAAD="${enableAAD,,}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" -if [ "${isCustomSSLEnabled,,}" == "true" ]; -then - customIdentityKeyStoreBase64String="${10}" - customIdentityKeyStorePassPhrase="${11}" - customIdentityKeyStoreType="${12}" - customTrustKeyStoreBase64String="${13}" - customTrustKeyStorePassPhrase="${14}" - customTrustKeyStoreType="${15}" - privateKeyAlias="${16}" - privateKeyPassPhrase="${17}" -fi - wlsAdminPort=7001 wlsAdminChannelPort=7005 wlsAdminURL="$adminVMName:$wlsAdminChannelPort" @@ -337,16 +305,16 @@ KEYSTORE_PATH="$wlsDomainPath/$wlsDomainName/keystores" validateInput cleanup - parseAndSaveCustomSSLKeyStoreData +parseAndSaveCustomSSLKeyStoreData - if [ "$enableAAD" == "true" ];then - parseLDAPCertificate - importAADCertificateIntoWLSCustomTrustKeyStore - fi - - wait_for_admin - configureSSL - restartAdminServerService - wait_for_admin +if [ "$enableAAD" == "true" ];then + parseLDAPCertificate + importAADCertificateIntoWLSCustomTrustKeyStore +fi + +wait_for_admin +configureSSL +restartAdminServerService +wait_for_admin cleanup 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 8b641f517..55733141d 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 @@ -174,7 +174,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' ', variables('const_aadParameters'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' <<< \"', variables('const_aadParameters'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json index 827300834..aec448257 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json @@ -444,7 +444,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), ' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-04-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), '\"')]" } } }, 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 ed331f2ee..4d384a43b 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 @@ -501,7 +501,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultPrivateKeyPassPhrase')),''),' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn),' ',string(parameters('enableCustomSSL')),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomIdentityKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStoreData')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultCustomTrustKeyStoreType')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultPrivateKeyAlias')),''),' ',if(parameters('enableCustomSSL'),base64(parameters('keyVaultPrivateKeyPassPhrase')),''),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json index 87d2603fe..4dd6bfb52 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json @@ -121,7 +121,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh ',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh <<< \"',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json index 4921c1d20..0ccfc595d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json @@ -146,7 +146,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' ', variables('const_wlsHome'), ' ', parameters('adminVMName'), ' ', variables('const_wlsAdminPort'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ',parameters('elasticsearchEndpoint') ,' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')),' ', variables('const_logIndex'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' <<< \"', variables('const_wlsHome'), ' ', parameters('adminVMName'), ' ', variables('const_wlsAdminPort'), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ',parameters('elasticsearchEndpoint') ,' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')),' ', variables('const_logIndex'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh index 225916481..86afdd3c7 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh @@ -367,41 +367,9 @@ function createTempFolder() sudo rm -rf $SCRIPT_PATH/* } -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" -SCRIPT_PWD=`pwd` -USER_ORACLE="oracle" -GROUP_ORACLE="oracle" -DOMAIN_PATH="/u01/domains" - -if [ $# -ne 20 ] -then - usage - exit 1 -fi +#main -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}" +read wlsUserName wlsPassword wlsDomainName adProviderName adServerHost adServerPort adPrincipal adPassword adGroupBaseDN adUserBaseDN oracleHome wlsAdminHost wlsAdminPort wlsADSSLCer wlsLDAPPublicIP wlsAdminServerName wlsDomainPath isCustomSSLEnabled customTrustKeyStorePassPhrase customTrustKeyStoreType isCustomSSLEnabled="${isCustomSSLEnabled,,}" @@ -413,6 +381,15 @@ fi wlsAdminURL=$wlsAdminHost:$wlsAdminPort +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" +SCRIPT_PWD=`pwd` +USER_ORACLE="oracle" +GROUP_ORACLE="oracle" +DOMAIN_PATH="/u01/domains" + validateInput createTempFolder echo "check status of admin server" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-oracle.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-oracle.sh index b340e08f4..6c7cd5a56 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-oracle.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-oracle.sh @@ -5,19 +5,6 @@ # Description # This script configures datasource on WebLogic Server Domain for Oracle database. -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 () { @@ -27,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -148,10 +135,17 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] +#main + +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi createTempFolder diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-postgresql.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-postgresql.sh index 87e2b032d..24c98c9ec 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-postgresql.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-postgresql.sh @@ -5,19 +5,6 @@ # Description # This script configures datasource on WebLogic Server Domain for PostgreSQL database. -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 () { @@ -27,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -154,17 +141,17 @@ args=("$@") # get number of elements ELEMENTS=${#args[@]} -# echo each element in array -# for loop -for (( i=0;i <$ELEMENTS;i++)); do - echo "ARG[${args[${i}]}]" -done +#main +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName -if [ $# -lt 9 ] +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi createTempFolder diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh index e4bf01ee9..b71837fee 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/datasourceConfig-sqlserver.sh @@ -5,19 +5,6 @@ # Description # This script configures datasource on WebLogic Server Domain for SQL Server database. -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 () { @@ -27,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -148,10 +135,17 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] +#main + +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi createTempFolder diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/elkIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/elkIntegration.sh index 94bb36213..b4027a59e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/elkIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/elkIntegration.sh @@ -5,25 +5,6 @@ # Description # This script configures ELK (Elasticsearch, Logstash and Kibana) Stack on WebLogic Server Domain. -oracleHome=$1 -wlsAdminHost=$2 -wlsAdminPort=$3 -wlsUserName=$4 -wlsPassword=$5 -wlsAdminServerName=$6 -elasticURI=$7 -elasticUserName=$8 -elasticPassword=$9 -wlsDomainName=${10} -wlsDomainPath=${11} -logsToIntegrate=${12} -logIndex=${13} - -hostName=`hostname` -wlsAdminURL=$wlsAdminHost:$wlsAdminPort -userOracle="oracle" -groupOracle="oracle" - #Function to output message to StdErr function echo_stderr () { @@ -33,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./aadIntegration.sh " + echo_stderr "./elkIntegration.sh <<< \"\"" } function validate_input() @@ -665,13 +646,18 @@ function validate_elastic_server() done } + +#main SCRIPT_PWD=`pwd` -if [ $# -ne 13 ] -then - usage - exit 1 -fi +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword wlsAdminServerName elasticURI elasticUserName elasticPassword wlsDomainName wlsDomainPath logsToIntegrate logIndex + +hostName=`hostname` +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +userOracle="oracle" +groupOracle="oracle" + create_temp_folder validate_input diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh index 069b8ec2f..54e160edf 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh @@ -14,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./setupAdminDomain.sh [] [] [] [] [] [] [] [] []" + echo_stderr "./setupAdminDomain.sh <<< \"\"" } function setupKeyStoreDir() @@ -488,39 +488,8 @@ function mountFileShare() CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE_DIR="$(readlink -f ${CURR_DIR})" -if [ $# -lt 10 ] -then - usage - exit 1 -fi - -wlsDomainName="$1" -wlsUserName="$2" -wlsPassword="$3" -wlsAdminHost="$4" -oracleHome="$5" -storageAccountName="${6}" -storageAccountKey="${7}" -mountpointPath="${8}" -isHTTPAdminListenPortEnabled="${9}" -adminPublicHostName="${10}" -isHTTPAdminListenPortEnabled="${isHTTPAdminListenPortEnabled,,}"; - -isCustomSSLEnabled="${11}" - -#case insensitive check -if [ "${isCustomSSLEnabled,,}" == "true" ]; -then - echo "custom ssl enabled. Reading keystore information" - customIdentityKeyStoreData="${12}" - customIdentityKeyStorePassPhrase="${13}" - customIdentityKeyStoreType="${14}" - customTrustKeyStoreData="${15}" - customTrustKeyStorePassPhrase="${16}" - customTrustKeyStoreType="${17}" - serverPrivateKeyAlias="${18}" - serverPrivateKeyPassPhrase="${19}" -fi +#read arguments from stdin +read wlsDomainName wlsUserName wlsPassword wlsAdminHost oracleHome storageAccountName storageAccountKey mountpointPath isHTTPAdminListenPortEnabled adminPublicHostName isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase DOMAIN_PATH="/u01/domains" startWebLogicScript="${DOMAIN_PATH}/${wlsDomainName}/startWebLogic.sh" 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 dd25e0da8..0f6ecc87c 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 @@ -2,9 +2,8 @@ # 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. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { 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 d1c986587..a9100ecfc 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 @@ -2,9 +2,8 @@ # 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. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { 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 5540e4f3e..4ecb474aa 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 @@ -2,9 +2,8 @@ # 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. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh index 3788f89ac..92d382f0b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-db.sh @@ -4,15 +4,8 @@ #Generate parameters with value for deploying db template independently -parametersPath=$1 -adminVMName=$2 -dbPassword=$3 -dbName=$4 -location=$5 -wlsusername=$6 -wlspassword=$7 -gitUserName=$8 -testbranchName=$9 +#read arguments from stdin +read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword gitUserName testbranchName cat < ${parametersPath}/parameters-deploy-db.json { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-elk.sh index 055318cb3..8f7117e13 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/gen-parameters-deploy-elk.sh @@ -4,18 +4,8 @@ #Generate parameters with value for deploying elk template independently -parametersPath=$1 -adminVMName=$2 -elasticsearchPassword=$3 -elasticsearchURI=$4 -elasticsearchUserName=$5 -location=$6 -wlsDomainName=$7 -wlsusername=$8 -wlspassword=$9 -gitUserName=${10} -testbranchName=${11} -guidValue=${12} +#read arguments from stdin +read parametersPath adminVMName elasticsearchPassword elasticsearchURI elasticsearchUserName location wlsDomainName wlsusername wlspassword gitUserName testbranchName guidValue cat < ${parametersPath} { 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 a22ba17cf..ba2c65e85 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 @@ -2,9 +2,8 @@ # 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. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat <${parametersPath} { 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 b65414b55..c4ceda175 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 @@ -2,9 +2,8 @@ # 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. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-deployments.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-deployments.sh index d87a46025..42bd61b5c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-deployments.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-deployments.sh @@ -2,12 +2,8 @@ # 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. -prefix="$1" -location="$2" -template="$3" -githubUserName="$4" -testbranchName="$5" -scriptsDir="$6" +#read arguments from stdin +read prefix location template githubUserName testbranchName scriptsDir groupName=${prefix}-preflight diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-access.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-access.sh index 4a1682106..c0af51526 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-access.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-access.sh @@ -3,8 +3,9 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. # Verifying admin server is accessible -adminPublicIP="$1" -adminPort=$2 + +#read arguments from stdin +read adminPublicIP adminPort isSuccess=false maxAttempt=5 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json index ce1232d94..2c94efe40 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json @@ -394,7 +394,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptCoherenceFile'), ' ', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ',variables('name_wlsServerPrefix'),' ',copyIndex(variables('const_cacheServerIndexOffset')),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyAlias), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyPassPhrase), 'null'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptCoherenceFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ',variables('name_wlsServerPrefix'),' ',copyIndex(variables('const_cacheServerIndexOffset')),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customIdentityKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreBase64String), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStorePassPhrase), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').customTrustKeyStoreType), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyAlias), 'null'),' ',if(parameters('customSSLSettings').enable,base64(parameters('customSSLSettings').privateKeyPassPhrase), 'null'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json index a49bd315e..278585185 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json @@ -632,7 +632,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ', copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,' ', variables('const_mountPointPath'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').publicIP, 'null'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').serverHost, 'null'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'${azure.apiVersion}').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'))]" } + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('managedServerPrefix'),' ', copyIndex(variables('const_appNodeMachineOffset')),' ', parameters('adminURL'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ',parameters('storageAccountName'), ' ', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,' ', variables('const_mountPointPath'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').certificateBase64String, 'null'),' ',if(parameters('aadsSettings').enable, parameters('aadsSettings').publicIP, 'null'),' ', if(parameters('aadsSettings').enable, parameters('aadsSettings').serverHost, 'null'),' ',if(parameters('appGatewaySettings').enable, reference(resourceId('Microsoft.Network/publicIPAddresses', parameters('appGatewaySettings').publicIPName),'${azure.apiVersion}').dnsSettings.fqdn, 'null'), ' ',parameters('elkSettings').enable, ' ',parameters('elkSettings').elasticsearchEndpoint,' ', parameters('elkSettings').elasticsearchUserName,' ', parameters('elkSettings').elasticsearchPassword, ' ', array.join(parameters('elkSettings').logsToIntegrate), ' ',parameters('elkSettings').logIndex, ' ', parameters('enableCoherence'),' ',parameters('customSSLSettings').enable,' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customIdentityKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreBase64String, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStorePassPhrase, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').customTrustKeyStoreType, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyAlias, 'null'),' ',if(parameters('customSSLSettings').enable,parameters('customSSLSettings').privateKeyPassPhrase, 'null'),'\"')]" } } }, { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh index b4e4932da..fcd0524d5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh @@ -14,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./addnode.sh " + echo_stderr "./addnode.sh <<< \"\"" } function installUtilities() @@ -709,61 +709,11 @@ function parseAndSaveCustomSSLKeyStoreData() SCRIPT_PWD=`pwd` -# store arguments in a special array -args=("$@") -# get number of elements -ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -#for (( i=0;i<$ELEMENTS;i++)); do -# echo "ARG[${args[${i}]}]" -#done - -if [ $# -lt 23 ] -then - usage - exit 1 -fi +#read arguments from stdin +read wlsDomainName wlsUserName wlsPassword managedServerPrefix serverIndex wlsAdminURL oracleHome wlsDomainPath storageAccountName storageAccountKey mountpointPath wlsADSSLCer wlsLDAPPublicIP adServerHost appGWHostName enableELK elasticURI elasticUserName elasticPassword logsToIntegrate logIndex enableCoherence isCustomSSLEnabled customIdentityKeyStoreBase64String customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreBase64String customTrustKeyStorePassPhrase customTrustKeyStoreType privateKeyAlias privateKeyPassPhrase -wlsDomainName=$1 -wlsUserName=$2 -wlsPassword=$3 -managedServerPrefix=$4 -serverIndex=$5 -wlsAdminURL=$6 -oracleHome=$7 -wlsDomainPath=$8 -storageAccountName=$9 -storageAccountKey=${10} -mountpointPath=${11} -wlsADSSLCer="${12}" -wlsLDAPPublicIP="${13}" -adServerHost="${14}" -appGWHostName=${15} -enableELK=${16} -elasticURI=${17} -elasticUserName=${18} -elasticPassword=${19} -logsToIntegrate=${20} -logIndex=${21} -enableCoherence=${22} - -isCustomSSLEnabled="${23}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" -if [ "${isCustomSSLEnabled,,}" == "true" ]; -then - customIdentityKeyStoreBase64String="${24}" - customIdentityKeyStorePassPhrase="${25}" - customIdentityKeyStoreType="${26}" - customTrustKeyStoreBase64String="${27}" - customTrustKeyStorePassPhrase="${28}" - customTrustKeyStoreType="${29}" - privateKeyAlias="${30}" - privateKeyPassPhrase="${31}" -fi - coherenceListenPort=7574 coherenceLocalport=42000 coherenceLocalportAdjust=42200 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json index abb5b6db4..11512a0c4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json @@ -197,7 +197,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' ', variables('const_aadParameters'),' ', add(copyIndex(),1))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' <<< \"', variables('const_aadParameters'),' ', add(copyIndex(),1),'\"')]" } } }, @@ -220,7 +220,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' ', variables('const_aadParameters'),' ', 0)]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAADConfiguration'),' <<< \"', variables('const_aadParameters'),' ', 0,'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json index 90a79fdb1..db77166e5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json @@ -397,7 +397,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' ', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersion}').dnsSettings.fqdn), ' ',variables('const_wlsHome'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptAGWConfiguration'),' <<< \"', variables('const_adminServerName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ', if(parameters('overrideHostName'), parameters('customDomainName'), reference(variables('ref_appGatewayPublicIP'), '${azure.apiVersion}').dnsSettings.fqdn), ' ',variables('const_wlsHome'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json index 7dd90b512..dce13e2f9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json @@ -576,7 +576,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json index 4538286d0..514d66b5f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json @@ -519,7 +519,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' ',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false','\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json index bb2e042a6..51e810b1b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json @@ -466,7 +466,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' ',variables('const_singleQuote'),parameters('wlsDomainName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('wlsUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ', variables('const_singleQuote'),parameters('adminVMName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),variables('const_wlsHome'),variables('const_singleQuote'),' ',variables('const_singleQuote'),variables('const_wlsDomainPath'),variables('const_singleQuote'),' ', variables('const_singleQuote'),parameters('storageAccountName'),variables('const_singleQuote'), ' ', variables('const_singleQuote'),listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,variables('const_singleQuote'),' ', variables('const_singleQuote'),variables('const_mountPointPath'),variables('const_singleQuote'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('enableELK'),' ',variables('const_singleQuote'),parameters('elasticsearchEndpoint'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchPassword'),variables('const_singleQuote'),' ',array.join(parameters('logsToIntegrate')),' ',variables('const_singleQuote'),parameters('logIndex'),variables('const_singleQuote'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),' ')]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"',variables('const_singleQuote'),parameters('wlsDomainName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('wlsUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ', variables('const_singleQuote'),parameters('adminVMName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),variables('const_wlsHome'),variables('const_singleQuote'),' ',variables('const_singleQuote'),variables('const_wlsDomainPath'),variables('const_singleQuote'),' ', variables('const_singleQuote'),parameters('storageAccountName'),variables('const_singleQuote'), ' ', variables('const_singleQuote'),listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersion2}').keys[0].value,variables('const_singleQuote'),' ', variables('const_singleQuote'),variables('const_mountPointPath'),variables('const_singleQuote'),' ', parameters('enableCoherenceWebLocalStorage'),' ',parameters('enableELK'),' ',variables('const_singleQuote'),parameters('elasticsearchEndpoint'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchUserName'),variables('const_singleQuote'),' ',variables('const_singleQuote'),parameters('elasticsearchPassword'),variables('const_singleQuote'),' ',array.join(parameters('logsToIntegrate')),' ',variables('const_singleQuote'),parameters('logIndex'),variables('const_singleQuote'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',string(parameters('enableCustomSSL')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreData')),' ',base64(parameters('keyVaultCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomIdentityKeyStoreType')),' ',base64(parameters('keyVaultCustomTrustKeyStoreData')),' ',base64(parameters('keyVaultCustomTrustKeyStorePassPhrase')),' ',base64(parameters('keyVaultCustomTrustKeyStoreType')),' ',base64(parameters('keyVaultPrivateKeyAlias')),' ',base64(parameters('keyVaultPrivateKeyPassPhrase')),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json index 963fb9a83..9a7c46f28 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json @@ -125,7 +125,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh ',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptFilePrefix'),parameters('databaseType'),'.sh <<< \"',variables('const_wlsHome'),' ',parameters('adminVMName'),' ',variables('const_wlsAdminPort'),' ',parameters('wlsUserName'),' ',variables('const_singleQuote'),parameters('wlsPassword'),variables('const_singleQuote'),' ',parameters('jdbcDataSourceName'),' ',variables('const_singleQuote'),parameters('dsConnectionURL'),variables('const_singleQuote'),' ',parameters('dbUser'),' ',variables('const_singleQuote'),parameters('dbPassword'),variables('const_singleQuote'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json index dc45c59e7..64c4ead8d 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json @@ -227,7 +227,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' ', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', concat(parameters('managedServerPrefix'), 'Storage'))]" + "commandToExecute": "[concat('sh',' ',variables('name_scriptELKConfiguration'),' <<< \"', variables('const_wlsHome'), ' ', concat(parameters('adminVMName'), ':', variables('const_wlsAdminPort')), ' ', parameters('wlsUserName'), ' ', parameters('wlsPassword'), ' ', variables('const_adminServerName'), ' ', parameters('elasticsearchEndpoint'),' ', parameters('elasticsearchUserName'),' ', parameters('elasticsearchPassword'), ' ', parameters('wlsDomainName'),' ', variables('const_wlsDomainPath'),' ', array.join(parameters('logsToIntegrate')), ' ',copyIndex(1), ' ', variables('const_logIndex'), ' ', concat(parameters('managedServerPrefix'), 'Storage'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh index c6709d548..f0ef3f737 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh @@ -13,7 +13,7 @@ function echo_stderr() #Function to display usage message function usage() { - echo_stderr "./aadIntegration.sh " + echo_stderr "./aadIntegration.sh <<< \"\"" } function validateInput() @@ -432,42 +432,10 @@ function createTempFolder() sudo rm -rf $SCRIPT_PATH/* } -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" -SCRIPT_PWD=`pwd` -USER_ORACLE="oracle" -GROUP_ORACLE="oracle" -DOMAIN_PATH="/u01/domains" - -if [ $# -ne 21 ] -then - usage - exit 1 -fi +#main -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} +#read arguments from stdin +read wlsUserName wlsPassword wlsDomainName adProviderName adServerHost adServerPort adPrincipal adPassword adGroupBaseDN adUserBaseDN oracleHome wlsAdminHost wlsAdminPort wlsADSSLCer wlsLDAPPublicIP wlsAdminServerName wlsDomainPath isCustomSSLEnabled customTrustKeyStorePassPhrase customTrustKeyStoreType vmIndex isCustomSSLEnabled="${isCustomSSLEnabled,,}" @@ -479,6 +447,16 @@ fi wlsAdminURL=$wlsAdminHost:$wlsAdminPort +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" +SCRIPT_PWD=`pwd` +USER_ORACLE="oracle" +GROUP_ORACLE="oracle" +DOMAIN_PATH="/u01/domains" + + if [ $vmIndex -eq 0 ]; then createTempFolder diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-oracle.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-oracle.sh index eba205182..09c58d59c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-oracle.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-oracle.sh @@ -3,19 +3,6 @@ # Description # This script is to configure datasource at WebLogic cluster domain. -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 () { @@ -25,7 +12,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -146,12 +133,20 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] +#main + +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + + createTempFolder validateInput createJDBCSource_model diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-postgresql.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-postgresql.sh index 5c877a34e..6dea2e6d3 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-postgresql.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-postgresql.sh @@ -3,19 +3,6 @@ # Description # This script is to configure datasource at WebLogic cluster domain. -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 () { @@ -25,7 +12,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -146,24 +133,19 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -# store arguments in a special array -args=("$@") -# get number of elements -ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -#for (( i=0;i <$ELEMENTS;i++)); do -# echo "ARG[${args[${i}]}]" -#done +#main +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName -if [ $# -lt 9 ] +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + createTempFolder validateInput createJDBCSource_model diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-sqlserver.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-sqlserver.sh index cab000698..2e62ec841 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-sqlserver.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/datasourceConfig-sqlserver.sh @@ -3,19 +3,6 @@ # Description # This script is to configure datasource at WebLogic cluster domain. -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 () { @@ -25,7 +12,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./configDatasource.sh " + echo_stderr "./configDatasource.sh <<< \"\"" } function validateInput() @@ -146,12 +133,19 @@ function createTempFolder() sudo rm -rf $scriptPath/* } -if [ $# -lt 9 ] +#main + +#read arguments from stdin +read oracleHome wlsAdminHost wlsAdminPort wlsUserName wlsPassword jdbcDataSourceName dsConnectionURL dsUser dsPassword wlsClusterName + +if [ -z "$wlsClusterName" ]; then - usage - exit 1 + wlsClusterName="cluster1" fi +wlsAdminURL=$wlsAdminHost:$wlsAdminPort +hostName=`hostname` + createTempFolder validateInput createJDBCSource_model diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/elkIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/elkIntegration.sh index ed0937145..1886abe37 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/elkIntegration.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/elkIntegration.sh @@ -12,7 +12,7 @@ function echo_stderr() { #Function to display usage message function usage() { - echo_stderr "./elkIntegration.sh " + echo_stderr "./elkIntegration.sh <<< \"\"" } function validate_input() { @@ -724,41 +724,13 @@ function validate_elastic_server() SCRIPT_PWD=$(pwd) -# store arguments in a special array -args=("$@") -# get number of elements -ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -#for ((i = 0; i < $ELEMENTS; i++)); do -# echo "ARG[${args[${i}]}]" -#done - -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} +#read arguments from stdin +read oracleHome wlsAdminURL wlsUserName wlsPassword wlsAdminServerName elasticURI elasticUserName elasticPassword wlsDomainName wlsDomainPath logsToIntegrate index logIndex managedServerPrefix hostName=$(hostname) userOracle="oracle" groupOracle="oracle" -if [ $# -ne 14 ]; then - usage - exit 1 -fi - create_temp_folder validate_input validate_elastic_server diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupApplicationGateway.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupApplicationGateway.sh index aeaa4c866..a44b5726e 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupApplicationGateway.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupApplicationGateway.sh @@ -12,7 +12,7 @@ function echo_stderr() #Function to display usage message function usage() { - echo_stderr "./setupApplicationGateway.sh " + echo_stderr "./setupApplicationGateway.sh <<< \"\"" } #Function to validate input @@ -135,21 +135,13 @@ EOF fi } +#main + SCRIPT_PWD=`pwd` -if [ $# -ne 7 ] -then - usage - exit 1 -fi - -wlsAdminServerName=$1 -wlsUserName=$2 -wlsPassword=$3 -wlsAdminHost=$4 -wlsAdminPort=$5 -AppGWHostName=$6 -oracleHome=$7 +#read arguments from stdin +read wlsAdminServerName wlsUserName wlsPassword wlsAdminHost wlsAdminPort AppGWHostName oracleHome + wlsAdminURL=$wlsAdminHost:$wlsAdminPort channelPort=8501 diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh index 60e98eaba..2b456263f 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh @@ -15,7 +15,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./setupClusterDomain.sh [ ]" + echo_stderr "./setupClusterDomain.sh <<< \"\"" } function installUtilities() @@ -740,52 +740,13 @@ sudo chmod -R 750 ${stopWebLogicScript} CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BASE_DIR="$(readlink -f ${CURR_DIR})" -# store arguments in a special array -args=("$@") -# get number of elements -ELEMENTS=${#args[@]} - -# echo each element in array -# for loop -#for (( i=0;i<$ELEMENTS;i++)); do -# echo "ARG[${args[${i}]}]" -#done - -if [ $# -le 8 ] -then - usage - exit 1 -fi +#read arguments from stdin +read wlsDomainName wlsUserName wlsPassword wlsServerName wlsAdminHost oracleHome storageAccountName storageAccountKey mountpointPath isHTTPAdminListenPortEnabled isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase -wlsDomainName=${1} -wlsUserName=${2} -wlsPassword=${3} -wlsServerName=${4} -wlsAdminHost=${5} -oracleHome=${6} -storageAccountName=${7} -storageAccountKey=${8} -mountpointPath=${9} - -isHTTPAdminListenPortEnabled="${10}" isHTTPAdminListenPortEnabled="${isHTTPAdminListenPortEnabled,,}" - -isCustomSSLEnabled="${11}" isCustomSSLEnabled="${isCustomSSLEnabled,,}" -#case insensitive check -if [ "${isCustomSSLEnabled}" == "true" ]; -then - echo "custom ssl enabled. Reading keystore information" - customIdentityKeyStoreData="${12}" - customIdentityKeyStorePassPhrase="${13}" - customIdentityKeyStoreType="${14}" - customTrustKeyStoreData="${15}" - customTrustKeyStorePassPhrase="${16}" - customTrustKeyStoreType="${17}" - serverPrivateKeyAlias="${18}" - serverPrivateKeyPassPhrase="${19}" -else +if [ "${isCustomSSLEnabled}" != "true" ]; isCustomSSLEnabled="false" fi diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh index 19fb8b4ef..09ce6e592 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh @@ -13,7 +13,7 @@ function echo_stderr() { #Function to display usage message function usage() { - echo_stderr "./setupCoherence.sh [ ]" + echo_stderr "./setupCoherence.sh <<< \"\"" } function installUtilities() { @@ -641,57 +641,12 @@ function storeCustomSSLCerts() SCRIPT_PWD=$(pwd) -# store arguments in a special array -args=("$@") -# get number of elements -ELEMENTS=${#args[@]} +read wlsDomainName wlsUserName wlsPassword adminVMName oracleHome wlsDomainPath storageAccountName storageAccountKey mountpointPath enableWebLocalStorage enableELK elasticURI elasticUserName elasticPassword logsToIntegrate logIndex managedServerPrefix serverIndex isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase -# echo each element in array -# for loop -#for ((i = 0; i < $ELEMENTS; i++)); do -# echo "ARG[${args[${i}]}]" -#done - -if [ $# -lt 19 ]; then - usage - exit 1 -fi - -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" ]; +if [ "${isCustomSSLEnabled}" != "true" ]; then - echo "custom ssl enabled. Reading keystore information" - customIdentityKeyStoreData="${20}" - customIdentityKeyStorePassPhrase="${21}" - customIdentityKeyStoreType="${22}" - customTrustKeyStoreData="${23}" - customTrustKeyStorePassPhrase="${24}" - customTrustKeyStoreType="${25}" - serverPrivateKeyAlias="${26}" - serverPrivateKeyPassPhrase="${27}" -else isCustomSSLEnabled="false" fi diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json index 261815c4b..3048c2143 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json @@ -123,7 +123,7 @@ ] }, "protectedSettings": { - "commandToExecute": "[concat('sh',' ', variables('name_scriptDeleteNode'), ' ', parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',array.join(parameters('deletingManagedServerNames')),' ',array.join(parameters('deletingManagedServerMachineNames')),' ', parameters('wlsForceShutDown'), ' ', parameters('adminVMName'), ' ',variables('const_wlsAdminPort'),' ',variables('const_wlsHome'))]" + "commandToExecute": "[concat('sh',' ', variables('name_scriptDeleteNode'), ' <<< \"', parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',array.join(parameters('deletingManagedServerNames')),' ',array.join(parameters('deletingManagedServerMachineNames')),' ', parameters('wlsForceShutDown'), ' ', parameters('adminVMName'), ' ',variables('const_wlsAdminPort'),' ',variables('const_wlsHome'),'\"')]" } } }, diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/scripts/deletenode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/scripts/deletenode.sh index b3241597a..f27f78975 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/scripts/deletenode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/scripts/deletenode.sh @@ -14,7 +14,7 @@ function echo_stderr () #Function to display usage message function usage() { - echo_stderr "./deletenode.sh " + echo_stderr "./deletenode.sh <<< \"\"" } function validateInput() @@ -194,20 +194,9 @@ function createTempFolder() #main script starts here -if [ $# -ne 8 ] -then - usage - exit 1 -fi - -wlsUserName=$1 -wlsPassword=$2 -managedServerNames=$3 -managedVMNames=$4 -wlsForceShutDown=$5 -wlsAdminHost=$6 -wlsAdminPort=$7 -oracleHome=$8 +#read arguments from stdin +read wlsUserName wlsPassword managedServerNames managedVMNames wlsForceShutDown wlsAdminHost wlsAdminPort oracleHome + wlsAdminURL=$wlsAdminHost:$wlsAdminPort hostName=`hostname` diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh index 79a284b73..2f0fa0410 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh @@ -5,14 +5,8 @@ # Description # This script is to generate test parameters for AAD and appgeateway testing. - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -keyVaultName=$4 -keyVaultResourceGroup=$5 -keyVaultSSLCertDataSecretName=$6 -keyVaultSSLCertPasswordSecretName=$7 +#read arguments from stdin +read parametersPath githubUserName testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh index aed7f9d60..20b12e72b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh @@ -5,10 +5,8 @@ # Description # This script is to generate test parameters for AAD testing. - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-ag.sh index 948249f6b..485570dc0 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-ag.sh @@ -5,14 +5,8 @@ # Description # This script is to generate test parameters for Appgateway testing. - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -keyVaultName=$4 -keyVaultResourceGroup=$5 -keyVaultSSLCertDataSecretName=$6 -keyVaultSSLCertPasswordSecretName=$7 +#read arguments from stdin +read parametersPath githubUserName testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-coherence.sh index 62e56798f..17e5ebb7c 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-coherence.sh @@ -5,10 +5,8 @@ # Description # This script is to generate test parameters for coherence testing. - -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat <${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh index ccffeef9c..42a4703ee 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh @@ -5,13 +5,8 @@ # Description # This script is to generate test parameters for database datasource, AAD and Appgateway testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -keyVaultName=$4 -keyVaultResourceGroup=$5 -keyVaultSSLCertDataSecretName=$6 -keyVaultSSLCertPasswordSecretName=$7 +#read arguments from stdin +read parametersPath githubUserName testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh index 6b3186348..cb8e77dc9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh @@ -5,9 +5,8 @@ # Description # This script is to generate test parameters for database datasource and AAD testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-ag.sh index 8406bf98e..d3ea23c73 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-ag.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-ag.sh @@ -5,13 +5,8 @@ # Description # This script is to generate test parameters for database datasource and Appgateway testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -keyVaultName=$4 -keyVaultResourceGroup=$5 -keyVaultSSLCertDataSecretName=$6 -keyVaultSSLCertPasswordSecretName=$7 +#read arguments from stdin +read parametersPath githubUserName testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db.sh index 068b1005d..0d2219a91 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db.sh @@ -5,9 +5,8 @@ # Description # This script is to generate test parameters for database datasource testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh index 0d60538e5..1d1db3bb3 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode-coherence.sh @@ -5,20 +5,8 @@ # Description # This script is to generate test parameters with value for deploying addnode template -parametersPath=$1 -adminPasswordOrKey=$2 -adminVMName=$3 -adminUsername=$4 -numberOfExistingCacheNodes=$5 -skuUrnVersion=$6 -storageAccountName=${7} -wlsDomainName=${8} -location=${9} -wlsusername=${10} -wlspassword=${11} -gitUserName=${12} -testbranchName=${13} -managedServerPrefix=${14} +#read arguments from stdin +read parametersPath adminPasswordOrKey adminVMName adminUsername numberOfExistingCacheNodes skuUrnVersion storageAccountName wlsDomainName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode.sh index 70a2e80c3..8fcfaa3f3 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-addnode.sh @@ -5,21 +5,8 @@ # Description # This script is to generate test parameters with value for deploying addnode template - -parametersPath=$1 -adminPasswordOrKey=$2 -adminURL=$3 -adminUsername=$4 -numberOfExistingNodes=$5 -skuUrnVersion=$6 -storageAccountName=${7} -wlsDomainName=${8} -location=${9} -wlsusername=${10} -wlspassword=${11} -gitUserName=${12} -testbranchName=${13} -managedServerPrefix=${14} +#read arguments from stdin +read parametersPath adminPasswordOrKey adminURL adminUsername numberOfExistingNodes skuUrnVersion storageAccountName wlsDomainName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix # do not include admin node. numberOfExistingNodes=$((numberOfExistingNodes - 1)) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-agw.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-agw.sh index 872f5a136..4c4f9d006 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-agw.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-agw.sh @@ -5,18 +5,8 @@ # Description # This script is to generate test parameters for Appgateway testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 -adminVMName=$4 -appGatewaySSLCertificateData=$5 -appGatewaySSLCertificatePassword=$6 -numberOfInstances=$7 -location=$8 -wlsPassword=$9 -wlsUserName=${10} -wlsDomainName=${11} -managedServerPrefix=${12} +#read arguments from stdin +read parametersPath githubUserName testbranchName adminVMName appGatewaySSLCertificateData appGatewaySSLCertificatePassword numberOfInstances location wlsPassword wlsUserName wlsDomainName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-coherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-coherence.sh index b7d7df950..1f33c2df6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-coherence.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-coherence.sh @@ -5,19 +5,8 @@ # Description # This script is to generate parameters with value for deploying coherence template independently. - -parametersPath=$1 -adminVMName=$2 -adminPasswordOrKey=$3 -skuUrnVersion=$4 -location=$5 -storageAccountName=$6 -wlsDomainName=$7 -wlsusername=$8 -wlspassword=$9 -gitUserName=${10} -testbranchName=${11} -managedServerPrefix=${12} +#read arguments from stdin +read parametersPath adminVMName adminPasswordOrKey skuUrnVersion location storageAccountName wlsDomainName wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh index 6b5ce6191..8c0e60eac 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-db.sh @@ -5,15 +5,8 @@ # Description # Generate parameters with value for deploying db template independently -parametersPath=$1 -adminVMName=$2 -dbPassword=$3 -dbName=$4 -location=$5 -wlsusername=$6 -wlspassword=$7 -gitUserName=$8 -testbranchName=$9 +#read arguments from stdin +read parametersPath adminVMName dbPassword dbName location wlsusername wlspassword gitUserName testbranchName cat < ${parametersPath}/parameters-deploy-db.json { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-deletenode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-deletenode.sh index 5bc1f9426..fabf25ad1 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-deletenode.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-deletenode.sh @@ -5,14 +5,8 @@ # Description # Generate parameters with value for deploying delete-node template. -parametersPath=$1 -adminVMName=$2 -location=${3} -wlsusername=${4} -wlspassword=${5} -gitUserName=${6} -testbranchName=${7} -managedServerPrefix=${8} +#read arguments from stdin +read parametersPath adminVMName location wlsusername wlspassword gitUserName testbranchName managedServerPrefix cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-elk.sh index e5263a287..bb6f5e0da 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-deploy-elk.sh @@ -5,20 +5,8 @@ # Description # Generate parameters with value for deploying elk template independently. -parametersPath=$1 -adminVMName=$2 -elasticsearchPassword=$3 -elasticsearchURI=$4 -elasticsearchUserName=$5 -location=$6 -numberOfInstances=$7 -wlsDomainName=$8 -wlsusername=$9 -wlspassword=${10} -gitUserName=${11} -testbranchName=${12} -managedServerPrefix=${13} -guidValue=${14} +#read arguments from stdin +read parametersPath adminVMName elasticsearchPassword elasticsearchURI elasticsearchUserName location numberOfInstances wlsDomainName wlsusername wlspassword gitUserName testbranchName managedServerPrefix guidValue numberOfInstances=$((numberOfInstances-1)) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-elk.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-elk.sh index 2a18a6d35..69f57c1e6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-elk.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-elk.sh @@ -5,9 +5,8 @@ # Description # This script is to generate test parameters for ELK testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat <${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters.sh index c84bd1ff7..90d8fdfd8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters.sh @@ -5,9 +5,8 @@ # Description # This script is to generate general test parameters for testing. -parametersPath=$1 -githubUserName=$2 -testbranchName=$3 +#read arguments from stdin +read parametersPath githubUserName testbranchName cat < ${parametersPath} { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-deployments.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-deployments.sh index e3ac38205..e7fb46f32 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-deployments.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-deployments.sh @@ -5,12 +5,8 @@ # Description # This scipt is to deploy the Azure deployments based on test parameters created. -prefix="$1" -location="$2" -template="$3" -githubUserName="$4" -testbranchName="$5" -scriptsDir="$6" +#read arguments from stdin +read prefix location template githubUserName testbranchName scriptsDir groupName=${prefix}-preflight keyVaultName=keyvault${prefix} diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-wls-access.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-wls-access.sh index b26946b63..acddc92e9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-wls-access.sh +++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/verify-wls-access.sh @@ -6,11 +6,9 @@ # This script is to test WebLogic admin, console and managed servers access. # Verifying admin server is accessible -adminPublicIP="$1" -adminPort=$2 -wlsUserName=$3 -wlspassword=$4 -managedServers=$5 + +#read arguments from stdin +read adminPublicIP adminPort wlsUserName wlspassword managedServers isSuccess=false maxAttempt=5