Merge pull request #6 from JesusAlvarezTorres/master

SharePointFixes

sharepoint-2013-non-ha/azuredeploy.json

@@ -328,6 +328,7 @@
         "spRDPNATRuleID": "[concat(variables('sppubliclbID'),'/inboundNatRules/',variables('sprdpNAT'))]",
         "spSourceDrive": "C:",
         "spSourceFolder": "SharePoint2013",
+        "SPProductKey": "N3MDM-DXR3H-JD7QH-QKKCR-BY2Y7",
         "sharePointFarmAccountUserName": "sp_farm",
         "spconfigDatabaseName": "SP_Config",
         "spadministrationContentDatabaseName": "SP_AdminContent",
@@ -335,6 +336,7 @@
         "spSiteTemplateName": "STS#0",
         "sharepointFarmName": "spFarm",
         "sppublicIPFQDN": "local.cloudapp.azure.com",
+        "spFQDN":  "[concat(variables('spVmNamePrefix'),'0.',parameters('domainName'))]",
         "spnicname": "SPMachine-Nic-",
 
         "subnets": [
@@ -768,21 +770,22 @@
                     "location": { "value": "[parameters('location')]" },
                     "domainName": { "value": "[parameters('domainName')]" },
                     "adminUserName": { "value": "[parameters('adminUsername')]" },
-                    "sharePointSetupUserAccountUserName": { "value": "[parameters('sqlServerServiceAccountUserName')]" },
-                    "sharePointFarmAccountUserName": { "value": "[variables('sharePointFarmAccountUserName')]" },
+                    "sharePointSetupUserAccountUserName": { "value": "[parameters('adminUsername')]" },
+                    "sharePointFarmAccountUserName": { "value": "[parameters('sqlServerServiceAccountUserName')]" },
                     "configDatabaseName": { "value": "[variables('spconfigDatabaseName')]" },
                     "administrationContentDatabaseName": { "value": "[variables('spadministrationContentDatabaseName')]" },
                     "sqlVMName": { "value": "[concat(variables('sqlClusterVmNamePrefix'), '0')]" },
-                    "fqdn": { "value": "[variables('sppublicIPFQDN')]" },
+                    "fqdn": { "value": "[variables('spFQDN')]" },
                     "contentDatabaseName": { "value": "[variables('spcontentDatabaseName')]" },
                     "spSiteTemplateName": { "value": "[variables('spSiteTemplateName')]" },
                     "adminPassword": { "value": "[parameters('adminPassword')]" },
-                    "sharePointSetupUserAccountPassword": { "value": "[parameters('sqlServerServiceAccountPassword')]" },
-                    "sharePointFarmAccountPassword": { "value": "[parameters('sharePointFarmAccountPassword')]" },
+                    "sharePointSetupUserAccountPassword": { "value": "[parameters('adminPassword')]" },
+                    "sharePointFarmAccountPassword": { "value": "[parameters('sqlServerServiceAccountPassword')]" },
                     "sharePointFarmPassphrasePassword": { "value": "[parameters('sharePointFarmPassphrasePassword')]" },
                     "sharepointFarmName": { "value": "[variables('sharepointFarmName')]" },
                     "sharepointInstallSourceDrive": { "value": "[variables('spSourceDrive')]" },
                     "sharepointInstallSourceFolder": { "value": "[variables('spSourceFolder')]" },
+                    "ProductKey": { "value": "[variables('SPProductKey')]" },
                     "assetLocation": { "value": "[parameters('assetLocation')]" }
                 }
             }

sharepoint-2013-non-ha/deploySharePointStandalone.json

@@ -59,6 +59,9 @@
         "sharepointInstallSourceFolder": {
             "type": "string"
         },
+        "ProductKey": {
+            "type": "string"
+        },
         "assetLocation": {
             "type": "string",
             "metadata": {
@@ -76,7 +79,6 @@
             "name": "[concat(parameters('spVMName'),'/ConfigureSPServer')]",
             "apiVersion": "2015-06-15",
             "dependsOn": [
-                "[concat('Microsoft.Compute/virtualMachines/', parameters('spVMName'))]"
             ],
             "location": "[parameters('location')]",
             "properties": {
@@ -109,7 +111,8 @@
                         "DatabaseServer": "[concat(parameters('sqlVMName'),'.',parameters('domainName'))]",
                         "Configuration": "[concat('{\"roles\":[{\"type\":\"application\",\"properties\":{\"fqdn\":\"',parameters('fqdn'),'\",\"port\":8080}},{\"type\":\"web\",\"properties\":{\"webApp\":{\"name\":\"',parameters('sharepointFarmName'),'\",\"applicationPool\":\"',parameters('sharepointFarmName'),' AppPool\",\"applicationPoolAccount\":\"', parameters('sharePointFarmAccountUserName'),'\",\"url\":\"http://',parameters('fqdn'),'\",\"port\":80,\"hostHeader\":\"',parameters('fqdn'),'\",\"databaseName\":\"',parameters('contentDatabaseName'),'\"},\"site\":{\"name\":\"',parameters('sharepointFarmName'),'\",\"template\":\"',parameters('spSiteTemplateName'),'\",\"url\":\"http://',parameters('fqdn'),'\",\"ownerAliasDomain\":\"',parameters('domainName'),'\",\"ownerAliasUserName\":\"',parameters('sharePointFarmAccountUserName'),'\",\"secondaryOwnerAliasDomain\":\"',parameters('domainName'),'\",\"secondaryOwnerAliasUserName\":\"',parameters('adminUserName'),'\"}}}],\"configureForHa\":\"False\",\"loadBalancedSetProbePort\":0}')]",
                         "InstallSourceDrive": "[parameters('sharepointInstallSourceDrive')]",
-                        "InstallSourceFolderName": "[parameters('sharepointInstallSourceFolder')]"
+                        "InstallSourceFolderName": "[parameters('sharepointInstallSourceFolder')]",
+                        "ProductKey": "[parameters('ProductKey')]"
                     }
                 },
                 "protectedSettings": {