Small changes

Playbooks/Block-ExchangeIP/Block-ExchangeIP.ps1

@@ -6,4 +6,4 @@
 
 Import-Module 'C:\Program Files\Microsoft\Exchange Server\V15\bin\RemoteExchange.ps1'; Connect-ExchangeServer -auto -ClientApplication:ManagementShell
 
-Add-IPBlockListEntry -IPAddress $IPToBeBlocked
+Add-IPBlockListEntry -IPAddress $IPToBeBlocked

Playbooks/Block-ExchangeIP/BlockExchangeIP.json

@@ -17,22 +17,19 @@
         "HybridWorkGroup": {
             "defaultValue": "Hybrid Worker Group configured for Exchange server",
             "type": "string"
-        },
-        "WorkBookName": {
-            "defaultValue": "B",
-            "type": "string"
         }
     },
     "variables": {
 		"AzureSentinelConnectionName": "[concat('azuresentinel-', parameters('PlaybookName'))]",
 		"AzureAutomationConnectionName": "[concat('azureautomation-', parameters('PlaybookName'))]",
-		"RunBookContentsURI":''
+		"RunBookContentsURI":"https://raw.githubusercontent.com/ThijsLecomte/ARM-Templates/master/Block-ExchangeIP.ps1",
+        "RunBookName":"Block-IPRunbook"
 	},
     "resources": [
         {
             "type": "Microsoft.Automation/automationAccounts/runbooks",
             "apiVersion": "2018-06-30",
-            "name": "[concat(parameters('AutomationAccount'), '/BlockIP2')]",
+            "name": "[concat(parameters('AutomationAccount'),'/',variables('RunBookName'))]",
             "location": "[resourceGroup().location]",
             "properties": {
                 "runbookType": "PowerShell",
@@ -40,7 +37,7 @@
                 "logProgress": false,
                 "logActivityTrace": 0,
 				"publishContentLink": {
-			  "uri": "https://raw.githubusercontent.com/ThijsLecomte/ARM-Templates/master/Block-ExchangeIP.ps1"
+			  "uri": "[variables('RunBookContentsURI')]"
 			  }
             }
         },
@@ -77,7 +74,8 @@
             "location": "[resourceGroup().location]",
 			"dependsOn": [
                 "[resourceId('Microsoft.Web/connections', variables('AzureSentinelConnectionName'))]",
-				"[resourceId('Microsoft.Web/connections', variables('AzureAutomationConnectionName'))]"
+				"[resourceId('Microsoft.Web/connections', variables('AzureAutomationConnectionName'))]",
+                "[concat('Microsoft.Automation/automationAccounts/', parameters('AutomationAccount'), '/runbooks/', variables('RunBookName'))]"
             ],
             "properties": {
                 "state": "Enabled",
@@ -181,7 +179,7 @@
                                         "method": "put",
                                         "path": "/subscriptions/@{encodeURIComponent('23ab6747-a21f-4e9d-ad68-0b0237ad7cd8')}/resourceGroups/@{encodeURIComponent('SecOps')}/providers/Microsoft.Automation/automationAccounts/@{encodeURIComponent('GeneralAutomation')}/jobs",
                                         "queries": {
-                                            "runbookName": "BlockIP",
+                                            "runbookName": "[variables('RunBookName')]",
                                             "wait": true,
                                             "x-ms-api-version": "2015-10-31"
                                         }