Added nginx.conf to the package to avoid the need for a custom zip

azure-resource-manager/EventStoreCluster/EventStoreCluster.deployproj

@@ -45,12 +45,15 @@
     <Content Include="Templates\azuredeploy.param.dev.json" />
     <Content Include="Templates\jumpbox-resources.json" />
     <Content Include="Templates\shared-resources.json" />
+    <None Include="Templates\cacert.pem" />
     <None Include="Templates\empty-resources.json" />
     <None Include="Templates\eventstore-ubuntu-sources.txt" />
     <None Include="Templates\eventstore-windows-sources.csv" />
     <None Include="Templates\install-eventstore.ps1" />
     <None Include="Templates\install-nginx.ps1" />
     <None Include="Templates\master.ps1" />
+    <None Include="Templates\nginx.conf" />
+    <None Include="Templates\privkey.pem" />
     <None Include="Tools\AzCopy.exe" />
     <None Include="Tools\Microsoft.Data.Edm.dll">
       <Visible>False</Visible>

azure-resource-manager/EventStoreCluster/Templates/azuredeploy.json

@@ -48,6 +48,20 @@
         "description": "Virtual Network"
       }
     },
+    "subnetName": {
+      "type": "string",
+      "defaultValue": "eventstore",
+      "metadata": {
+        "description": "Subnet"
+      }
+    },
+    "namespace": {
+      "type": "string",
+      "defaultValue": "es",
+      "metadata": {
+        "description": "Namespace for vms, ips, etc."
+      }
+    },
     "OS": {
       "type": "string",
       "defaultValue": "windows",
@@ -86,7 +100,7 @@
     },
     "vmSizeEventStoreNode": {
       "type": "string",
-      "defaultValue": "Standard_D2",
+      "defaultValue": "Standard_DS2_v2",
       "allowedValues": [
         "Standard_D1",
         "Standard_D2",
@@ -100,7 +114,17 @@
         "Standard_DS2",
         "Standard_DS3",
         "Standard_DS4",
-        "Standard_DS13"
+        "Standard_DS13",
+        "Standard_DS1_v2",
+        "Standard_DS2_v2",
+        "Standard_DS3_v2",
+        "Standard_DS4_v2",
+        "Standard_DS5_v2",
+        "Standard_DS11_v2",
+        "Standard_DS12_v2",
+        "Standard_DS13_v2",
+        "Standard_DS14_v2",
+        "Standard_DS15_v2"
       ],
       "metadata": {
         "description": "Size of the Event Store data nodes"
@@ -115,8 +139,12 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "3.8.1",
+      "defaultValue": "3.9.3",
       "allowedValues": [
+        "3.9.3",
+        "3.9.2",
+        "3.9.1",
+        "3.9.0",
         "3.8.1",
         "3.8.0",
         "3.7.0",
@@ -142,6 +170,15 @@
         "description": "Event Store version to install"
       }
     },
+    "esRunProjections": {
+      "type": "string",
+      "defaultValue": "All",
+      "allowedValues": [
+        "None",
+        "System",
+        "All"
+      ]
+    },
     "githubAccount": {
       "type": "string",
       "defaultValue": "pbolduc",
@@ -195,7 +232,7 @@
       "addressPrefix": "10.0.0.0/16",
       "subnet": {
         "eventstore": {
-          "name": "eventstore",
+          "name": "[parameters('subnetName')]",
           "prefix": "10.0.1.0/28",
           "networkPrefix": "10.0.1",
           "vnet": "[parameters('virtualNetworkName')]"
@@ -210,8 +247,11 @@
       "[concat(variables('templateBaseUrl'), 'master.ps1')]",
       "[concat(variables('templateBaseUrl'), 'create-data-disks.ps1')]",
       "[concat(variables('templateBaseUrl'), 'install-eventstore.ps1')]",
+      "[concat(variables('templateBaseUrl'), 'install-nginx.ps1')]",
       "[concat(variables('templateBaseUrl'), 'eventstore-windows-sources.csv')]",
-      "[concat(variables('templateBaseUrl'), 'install-nginx.ps1')]"
+      "[concat(variables('templateBaseUrl'), 'nginx.conf')]",
+      "[concat(variables('templateBaseUrl'), 'cacert.pem')]",
+      "[concat(variables('templateBaseUrl'), 'privkey.pem')]"
     ],
     "windowsSettings": {
       "imageReference": {
@@ -229,7 +269,7 @@
           "autoUpgradeMinorVersion": true,
           "settings": {
             "fileUris": "[variables('windowsScripts')]",
-            "commandToExecute": "[concat('powershell.exe -File master.ps1 -ClusterSize ',parameters('vmEventStoreNodeCount'),' -esVer ',parameters('esVersion'))]"
+            "commandToExecute": "[concat('powershell.exe -File master.ps1 -ClusterSize ',parameters('vmEventStoreNodeCount'),' -esVer ',parameters('esVersion'), ' -esRunProjections ',parameters('esRunProjections'))]"
           }
         }
       }
@@ -281,6 +321,56 @@
         "nodesPerStorageAccount": 2,
         "storageAccountType": "Premium_LRS"
       },
+      "Standard_DS1_v2": {
+        "dataDisks": 2,
+        "nodesPerStorageAccount": 6,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS2_v2": {
+        "dataDisks": 4,
+        "nodesPerStorageAccount": 4,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS3_v2": {
+        "dataDisks": 8,
+        "nodesPerStorageAccount": 4,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS4_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS5_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS11_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS12_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS13_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS14_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
+      "Standard_DS15_v2": {
+        "dataDisks": 16,
+        "nodesPerStorageAccount": 2,
+        "storageAccountType": "Premium_LRS"
+      },
       "Standard_A2": {
         "dataDisks": 4,
         "nodesPerStorageAccount": 6,
@@ -427,7 +517,7 @@
             "value": "[parameters('vmEventStoreDataDiskSize')]"
           },
           "namespace": {
-            "value": "es"
+            "value": "[parameters('namespace')]"
           },
           "osSettings": {
             "value": "[variables('osSettings')]"

azure-resource-manager/EventStoreCluster/Templates/azuredeploy.param.dev.json

@@ -6,13 +6,31 @@
       "value": "EventStoreAdmin"
     },
     "adminPassword": {
-      "value":  "YourEventStoreVMPassword"
+      "value": "YourEventStoreVMPassword!123"
     },
-    "jumpbox":  {
+    "jumpbox": {
       "value": "No"
     },
-    "vmEventStoreNodeCount":  {
+    "namespace": {
+      "value": "test-es"
+    },
+    "subnetName": {
+      "value": "test-eventstore"
+    },
+    "virtualNetworkName": {
+      "value": "test-es-vnet"
+    },
+    "vmEventStoreNodeCount": {
       "value": 3
+    },
+    "vmSizeEventStoreNode": {
+      "value": "Standard_DS3_v2"
+    },
+    "vmEventStoreDataDiskSize": {
+      "value": 128
+    },
+    "githubAccount": {
+      "value": "agconnections"
     }
   }
 }

azure-resource-manager/EventStoreCluster/Templates/cacert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID1zCCAr+gAwIBAgIJANlglY0XoRznMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
+BAYTAlVTMREwDwYDVQQIEwhLZW50dWNreTEPMA0GA1UEBxMGTXVycmF5MR0wGwYD
+VQQKExRBZyBDb25uZWN0aW9ucywgTExDLjAeFw0xNjA4MDIxNTQ2MDJaFw0xOTA4
+MDIxNTQ2MDJaMFAxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhLZW50dWNreTEPMA0G
+A1UEBxMGTXVycmF5MR0wGwYDVQQKExRBZyBDb25uZWN0aW9ucywgTExDLjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8g9qRHP08v8dbtaibb5mSWYlfL
+SwhaAl2BCJMDuAyVfagTgOAX9Wx4C+ueLXlbMDhKTKIUFHwRvHxd2Hxt0vBvvyG2
+lW4LZP8lKWVesf3sfT7/g9/nY78LMlSmnDbL8arN0pZdoplE2/KRQyZlgSG8IfLx
+lVmFqQ3X2ynJOcz1mb/rJW2hT7kEfX/kjD0QGs3c7AyEQTblpqlxKsb5PiVui4N/
+m8HWSa40cUANq92hgZp0lQEtoUdja49J3dvtlJbAENcQTc9soFV6x+p9yons52bc
+czuF86oht4TXIxEHmhpJ0+tMabWaU4MAasvzDf+7N99O4gAp6UhZA/zz3fUCAwEA
+AaOBszCBsDAdBgNVHQ4EFgQU29LSoW8IoIRUNLDTC6nYPYO/QRkwgYAGA1UdIwR5
+MHeAFNvS0qFvCKCEVDSw0wup2D2Dv0EZoVSkUjBQMQswCQYDVQQGEwJVUzERMA8G
+A1UECBMIS2VudHVja3kxDzANBgNVBAcTBk11cnJheTEdMBsGA1UEChMUQWcgQ29u
+bmVjdGlvbnMsIExMQy6CCQDZYJWNF6Ec5zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBBQUAA4IBAQC3vrV+zMFKzjmNZ0WFA28K0Bes0RKxhEI9rVNxQgfZOlN9Th9S
+UvF3FQeRYVEIA4jw/vIsbhShGrZt3D09z/r5OPBYuuJ3Dh9ob/W5KbpmLh615Rmv
+euKnXNVKh3ylLukJqUCcgRyKi9xrWwGa1rnvXx0/kOIgq0KJIPBgGDJjiwDSD2n+
+5X0h8eGQDxqyB/wmjYhe80FgJrwlmzWx6korZ548N6m8rVLzxJE3TKpdPPzvh7Kp
+IzPMhsvJf7Ml5W7o+Ym9Y7Rj+JMls5+6e1Qd65GdZ0+upwBRMPp5hVVYtyn6Mv85
+lhI45Bl/VvG7XDfKaMozHWX2M8DqI4utkKmE
+-----END CERTIFICATE-----

azure-resource-manager/EventStoreCluster/Templates/eventstore-ubuntu-sources.txt

@@ -2,6 +2,10 @@
 # to do: make this file contents something unbuntu shell script can process natively
 #
 
+"3.9.3": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.9.3.tar.gz",
+"3.9.2": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.9.2.tar.gz",
+"3.9.1": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.9.1.tar.gz",
+"3.9.0": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.9.0.tar.gz",
 "3.8.1": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.8.1.tar.gz",
 "3.8.0": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.8.0.tar.gz",
 "3.7.0": "http://download.geteventstore.com/binaries/EventStore-OSS-Ubuntu-14.04-v3.7.0.tar.gz",

azure-resource-manager/EventStoreCluster/Templates/eventstore-windows-sources.csv

@@ -1,4 +1,8 @@
-"3.8.1",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.8.1.zip
+"3.9.3",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.9.3.zip
+"3.9.2",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.9.2.zip
+"3.9.1",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.9.1.zip
+"3.9.0",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.9.0.zip
+"3.8.1",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.8.1.zip
 "3.8.0",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.8.0.zip
 "3.7.0",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.7.0.zip
 "3.6.3",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.6.3.zip
@@ -17,4 +21,4 @@
 "3.0.3",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.0.3.zip
 "3.0.2",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.0.2.zip
 "3.0.1",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.0.1.zip
-"3.0.0",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.0.0.zip
+"3.0.0",http://download.geteventstore.com/binaries/EventStore-OSS-Win-v3.0.0.zip

azure-resource-manager/EventStoreCluster/Templates/install-eventstore.ps1

@@ -23,7 +23,9 @@ param (
     [Int]
     $ExtHttpPort = 2113,
 	[string]
-	$downloadDirectory
+	$downloadDirectory,
+	[string]
+	$RunProjections = "All"
 )
 
 function Extract-ZipFile($file, $destination) {
@@ -108,6 +110,7 @@ Add-Content F:\eventstore\config.yaml "IntIp:            $ipAddress`n"
 Add-Content F:\eventstore\config.yaml "ClusterSize:      $ClusterSize`n"
 Add-Content F:\eventstore\config.yaml "DiscoverViaDns:   false`n"
 Add-Content F:\eventstore\config.yaml "GossipSeed:       10.0.1.4:$IntHttpPort,10.0.1.5:$IntHttpPort,10.0.1.6:$IntHttpPort`n"
+Add-Content F:\eventstore\config.yaml "RunProjections:   $RunProjections`n"
 
 Add-Content F:\eventstore\install-service.cmd "F:\nssm-2.24\win64\nssm.exe install EventStore F:\eventstore\bin\EventStore.ClusterNode.exe --config F:\eventstore\config.yaml"
 Add-Content F:\eventstore\install-service.cmd "F:\nssm-2.24\win64\nssm.exe set EventStore Description ""The EventStore service"""

azure-resource-manager/EventStoreCluster/Templates/install-nginx.ps1

@@ -47,6 +47,24 @@ New-NetFirewallRule -Name Allow_80_In `
 					-Action Allow `
 					-LocalPort 80
 
+New-NetFirewallRule -Name Allow_443_In `
+					-DisplayName "Allow inbound port 443 traffic" `
+					-Protocol TCP `
+					-Direction Inbound `
+					-Action Allow `
+					-LocalPort 443
+
+New-NetFirewallRule -Name Allow_3389_In `
+					-DisplayName "Allow inbound port 3389 traffic" `
+					-Protocol TCP `
+					-Direction Inbound `
+					-Action Allow `
+					-LocalPort 3389
+
+Copy-Item '.\nginx.conf' 'F:\nginx\bin\nginx-1.10.1\conf\nginx.conf' -Force
+Copy-Item '.\cacert.pem' 'F:\nginx\bin\nginx-1.10.1\conf\cacert.pem' -Force
+Copy-Item '.\privkey.pem' 'F:\nginx\bin\nginx-1.10.1\conf\privkey.pem' -Force
+
 Add-Content F:\nginx\install-service.cmd "F:\nssm-2.24\win64\nssm.exe install Nginx F:\nginx\bin\nginx-1.10.1\nginx.exe"
 Add-Content F:\nginx\install-service.cmd "F:\nssm-2.24\win64\nssm.exe set Nginx Description ""The Nginx service"""
 

azure-resource-manager/EventStoreCluster/Templates/master.ps1

@@ -4,8 +4,9 @@
 param(
 	[Int32]$ClusterSize,
 	[string]$esVer,
+	[string]$esRunProjections,
 	[string]$nginxVer="1.10.1",
-	[string]$nginxUrl="https://landdb.blob.core.windows.net/eventstore-cluster-resources/nginx-1.10.1.zip"
+	[string]$nginxUrl="http://nginx.org/download/nginx-1.10.1.zip"
 )
 
 $ErrorActionPreference="SilentlyContinue"
@@ -20,6 +21,7 @@ New-Item $downloadDirectory -ItemType Directory | Out-Null
 
 # TODO: These parameters should come from the template!
 . .\install-eventstore.ps1 -EventStoreVersion $esVer `
+						   -RunProjections $esRunProjections `
 						   -nssmDownloadUrl "https://nssm.cc/release/nssm-2.24.zip" `
 						   -ClusterSize $ClusterSize `
 						   -downloadDirectory $downloadDirectory