From 4a8781f698cae22b27f950d35053d8ba8da37e5c Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 13 Mar 2021 21:41:20 -0800 Subject: [PATCH] Small fixes for azure --- Azure/Ansible/inventory.yml | 12 ++++++------ Azure/Terraform/locals.tf | 1 + Azure/Terraform/main.tf | 2 +- Azure/Terraform/outputs.tf | 6 +++++- Vagrant/scripts/install-exchange.ps1 | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Azure/Ansible/inventory.yml b/Azure/Ansible/inventory.yml index 3990702..a581d90 100644 --- a/Azure/Ansible/inventory.yml +++ b/Azure/Ansible/inventory.yml @@ -2,17 +2,17 @@ # Replace the x's with the IP addresses from "terrafrom output" dc: hosts: - x.x.x.x: + 13.77.149.92: wef: hosts: - y.y.y.y: + 13.66.251.74: win10: hosts: - z.z.z.z: + 13.66.225.219: -#exchange: - #hosts: - #w.w.w.w: +exchange: + hosts: + 52.183.7.185: diff --git a/Azure/Terraform/locals.tf b/Azure/Terraform/locals.tf index d6b5ebc..aa1d8da 100644 --- a/Azure/Terraform/locals.tf +++ b/Azure/Terraform/locals.tf @@ -4,4 +4,5 @@ locals { ata_url = "https://${azurerm_public_ip.wef-publicip.ip_address}" guacamole_url = "http://${azurerm_public_ip.logger-publicip.ip_address}:8080/guacamole" velociraptor_url = "https://${azurerm_public_ip.logger-publicip.ip_address}:9999" + exchange_url = "https://${azurerm_public_ip.exchange-publicip[0].ip_address}" } diff --git a/Azure/Terraform/main.tf b/Azure/Terraform/main.tf index f5a7088..09e72ad 100644 --- a/Azure/Terraform/main.tf +++ b/Azure/Terraform/main.tf @@ -553,7 +553,7 @@ resource "azurerm_virtual_machine" "exchange" { } storage_os_disk { - name = "OsDiskWef" + name = "OsDiskExchange" caching = "ReadWrite" create_option = "FromImage" managed_disk_type = "Standard_LRS" diff --git a/Azure/Terraform/outputs.tf b/Azure/Terraform/outputs.tf index 4f7000d..b4799d1 100644 --- a/Azure/Terraform/outputs.tf +++ b/Azure/Terraform/outputs.tf @@ -18,6 +18,10 @@ output "win10_public_ip" { value = azurerm_public_ip.win10-publicip.ip_address } +output "exchange_public_ip" { + value = azurerm_public_ip.exchange-publicip[0].ip_address +} + output "ata_url" { value = local.ata_url } @@ -39,5 +43,5 @@ output "velociraptor_url" { } output "exchange_url" { - value = local.velociraptor_url + value = local.exchange_url } diff --git a/Vagrant/scripts/install-exchange.ps1 b/Vagrant/scripts/install-exchange.ps1 index 1f99923..e0003f4 100644 --- a/Vagrant/scripts/install-exchange.ps1 +++ b/Vagrant/scripts/install-exchange.ps1 @@ -30,7 +30,7 @@ Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) [+] Failure to reboot will cause the # Warn the user if less than 8GB of memory If ($physicalMemory -lt 8000000000) { - Write-Host "It is STRONGLY recommended that you provide this host with 4GB+ of memory before continuing or it is highly likely that it will run out of memory while installing Exchange." + Write-Host "It is STRONGLY recommended that you provide this host with 8GB+ of memory before continuing or it is highly likely that it will run out of memory while installing Exchange." $ignore = Read-Host "Type 'ignore' to continue anyways, otherwise this script will exit." If ($ignore -ne "ignore") { Write-Host "Exiting."