fixing the conflicts - applying fix from the git commit: 0c1665a374

nested/controllerconfig.json

@@ -37,7 +37,7 @@
                     ]
                 },
                 "protectedSettings":{
-                    "commandToExecute": "[concat('bash ', parameters('moodleCommon').moodleInstallScriptFilename, ' ', parameters('moodleCommon').moodleVersion, ' ', concat(parameters('moodleCommon').gfsNameRoot, '0'), ' ', 'data', ' ', parameters('moodleCommon').siteURL, ' ', parameters('moodleCommon').dbDNS, ' ', parameters('moodleCommon').moodleDbName, ' ', parameters('moodleCommon').moodleDbUser, ' ', parameters('moodleCommon').moodleDbPass, ' ', parameters('moodleCommon').moodleAdminPass, ' ', concat(parameters('moodleCommon').dbLogin, '@', parameters('moodleCommon').dbServerType, '-', parameters('moodleCommon').resourcesPrefix), ' ', parameters('moodleCommon').dbLoginPassword, ' ', parameters('moodleCommon').storageAccountName, ' ', listKeys(variables('storageAccountId'), '2017-06-01').keys[0].value, ' ', parameters('moodleCommon').moodleDbUserAzure, ' ', parameters('moodleCommon').redisDns, ' ', parameters('redisKey'), ' ', parameters('moodleCommon').elasticVm1IP, ' ', parameters('moodleCommon').installO365pluginsSwitch, ' ', parameters('moodleCommon').dbServerType, ' ', parameters('moodleCommon').fileServerType , ' ', parameters('moodleCommon').mssqlDbServiceObjectiveName, ' ',  parameters('moodleCommon').mssqlDbEdition, ' ',  parameters('moodleCommon').mssqlDbSize, ' ', parameters('moodleCommon').installObjectFsSwitch, ' ', parameters('moodleCommon').installGdprPluginsSwitch, ' ', parameters('moodleCommon').thumbprintSslCert, ' ', parameters('moodleCommon').thumbprintCaCert, ' ', parameters('moodleCommon').searchType, ' ', parameters('azureSearchKey'), ' ', parameters('moodleCommon').azureSearchNameHost, ' ', parameters('moodleCommon').tikaVmIP)"
+                    "commandToExecute": "[concat('bash ', parameters('moodleCommon').moodleInstallScriptFilename, ' ', parameters('moodleCommon').moodleVersion, ' ', concat(parameters('moodleCommon').gfsNameRoot, '0'), ' ', 'data', ' ', parameters('moodleCommon').siteURL, ' ', parameters('moodleCommon').httpsTermination, ' ', parameters('moodleCommon').dbDNS, ' ', parameters('moodleCommon').moodleDbName, ' ', parameters('moodleCommon').moodleDbUser, ' ', parameters('moodleCommon').moodleDbPass, ' ', parameters('moodleCommon').moodleAdminPass, ' ', concat(parameters('moodleCommon').dbLogin, '@', parameters('moodleCommon').dbServerType, '-', parameters('moodleCommon').resourcesPrefix), ' ', parameters('moodleCommon').dbLoginPassword, ' ', parameters('moodleCommon').storageAccountName, ' ', listKeys(variables('storageAccountId'), '2017-06-01').keys[0].value, ' ', parameters('moodleCommon').moodleDbUserAzure, ' ', parameters('moodleCommon').redisDns, ' ', parameters('redisKey'), ' ', parameters('moodleCommon').elasticVm1IP, ' ', parameters('moodleCommon').installO365pluginsSwitch, ' ', parameters('moodleCommon').dbServerType, ' ', parameters('moodleCommon').fileServerType , ' ', parameters('moodleCommon').mssqlDbServiceObjectiveName, ' ',  parameters('moodleCommon').mssqlDbEdition, ' ',  parameters('moodleCommon').mssqlDbSize, ' ', parameters('moodleCommon').installObjectFsSwitch, ' ', parameters('moodleCommon').installGdprPluginsSwitch, ' ', parameters('moodleCommon').thumbprintSslCert, ' ', parameters('moodleCommon').thumbprintCaCert, ' ', parameters('moodleCommon').searchType, ' ', parameters('azureSearchKey'), ' ', parameters('moodleCommon').azureSearchNameHost, ' ', parameters('moodleCommon').tikaVmIP)"
                 },
                 "type": "CustomScript",
                 "typeHandlerVersion": "2.0"

scripts/install_moodle.sh

@@ -26,33 +26,34 @@
     glusterNode=${2}
     glusterVolume=${3}
     siteFQDN=${4}
-    dbIP=${5}
-    moodledbname=${6}
-    moodledbuser=${7}
-    moodledbpass=${8}
-    adminpass=${9}
-    dbadminlogin=${10}
-    dbadminpass=${11}
-    wabsacctname=${12}
-    wabsacctkey=${13}
-    azuremoodledbuser=${14}
-    redisDns=${15}
-    redisAuth=${16}
-    elasticVm1IP=${17}
-    installO365pluginsSwitch=${18}
-    dbServerType=${19}
-    fileServerType=${20}
-    mssqlDbServiceObjectiveName=${21}
-    mssqlDbEdition=${22}
-    mssqlDbSize=${23}
-    installObjectFsSwitch=${24}
-    installGdprPluginsSwitch=${25}
-    thumbprintSslCert=${26}
-    thumbprintCaCert=${27}
-    searchType=${28}
-    azureSearchKey=${29}
-    azureSearchNameHost=${30}
-    tikaVmIP=${31}
+    httpsTermination=${5}
+    dbIP=${6}
+    moodledbname=${7}
+    moodledbuser=${8}
+    moodledbpass=${9}
+    adminpass=${10}
+    dbadminlogin=${11}
+    dbadminpass=${12}
+    wabsacctname=${13}
+    wabsacctkey=${14}
+    azuremoodledbuser=${15}
+    redisDns=${16}
+    redisAuth=${17}
+    elasticVm1IP=${18}
+    installO365pluginsSwitch=${19}
+    dbServerType=${20}
+    fileServerType=${21}
+    mssqlDbServiceObjectiveName=${22}
+    mssqlDbEdition=${23}
+    mssqlDbSize=${24}
+    installObjectFsSwitch=${25}
+    installGdprPluginsSwitch=${26}
+    thumbprintSslCert=${27}
+    thumbprintCaCert=${28}
+    searchType=${29}
+    azureSearchKey=${30}
+    azureSearchNameHost=${31}
+    tikaVmIP=${32}
 
     echo $moodleVersion        >> /tmp/vars.txt
     echo $glusterNode          >> /tmp/vars.txt