From 408c0f66a743e272f5a49880f92d165c552e4f18 Mon Sep 17 00:00:00 2001
From: netevert <netevert@protonmail.com>
Date: Wed, 3 Feb 2021 22:59:38 +0100
Subject: [PATCH] fixed miscellaneous issues

---
 lab/files/install-utilities.ps1 | 3 ++-
 lab/main.tf                     | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lab/files/install-utilities.ps1 b/lab/files/install-utilities.ps1
index 9e3eb09..9263538 100644
--- a/lab/files/install-utilities.ps1
+++ b/lab/files/install-utilities.ps1
@@ -122,4 +122,5 @@ $domain = $fulldomain
 $password = $adminpassword | ConvertTo-SecureString -asPlainText -Force
 $username = $adminusername 
 $credential = New-Object System.Management.Automation.PSCredential($username,$password)
-Add-Computer -DomainName $domain -Credential $credential
\ No newline at end of file
+Add-Computer -DomainName $domain -Credential $credential
+Restart-Computer
\ No newline at end of file
diff --git a/lab/main.tf b/lab/main.tf
index 5343f41..1debb68 100644
--- a/lab/main.tf
+++ b/lab/main.tf
@@ -182,7 +182,6 @@ resource "azurerm_virtual_machine" "dc1" {
 }
 
 # Create active directory domain forest
-# https://raw.githubusercontent.com/BlueTeamLabs/sentinel-attack/master/lab/files/create-ad.ps1
 resource "azurerm_virtual_machine_extension" "create_ad" {
   name                 = "create_ad"
   virtual_machine_id   = azurerm_virtual_machine.dc1.id
@@ -192,7 +191,7 @@ resource "azurerm_virtual_machine_extension" "create_ad" {
   tags                 = var.tags
   protected_settings = <<PROT
     {
-      "fileUris": ["https://raw.githubusercontent.com/netevert/scripts/master/create-ad.ps1"],
+      "fileUris": ["https://raw.githubusercontent.com/BlueTeamLabs/sentinel-attack/master/lab/files/create-ad.ps1"],
       "commandToExecute": "powershell -ExecutionPolicy Unrestricted -File create-ad.ps1 ${var.accounts.dc1_admin_password} ${var.prefix}.com ${var.prefix}"
     }
   PROT
@@ -272,7 +271,6 @@ resource "azurerm_virtual_machine" "pc1" {
 }
  
 # Install utilities on workstation 1 and join domain
-# https://raw.githubusercontent.com/BlueTeamLabs/sentinel-attack/master/lab/files/install-utilities.ps1
 resource "azurerm_virtual_machine_extension" "utils_pc1" {
   name                 = "utils_pc1"
   virtual_machine_id = azurerm_virtual_machine.pc1.id
@@ -282,8 +280,8 @@ resource "azurerm_virtual_machine_extension" "utils_pc1" {
   tags                 = var.tags
   protected_settings = <<PROT
     {
-      "fileUris": ["https://raw.githubusercontent.com/netevert/scripts/master/install-utilities.ps1"],
-      "commandToExecute": "powershell -ExecutionPolicy Unrestricted -File install-utilities.ps1 ${var.prefix}.com ${var.accounts.dc1_admin_password} ${var.prefix}.com\${var.accounts.dc1_admin_user}"
+      "fileUris": ["https://raw.githubusercontent.com/BlueTeamLabs/sentinel-attack/master/lab/files/install-utilities.ps1"],
+      "commandToExecute": "powershell -ExecutionPolicy Unrestricted -File install-utilities.ps1 ${var.prefix}.com ${var.accounts.dc1_admin_password} ${var.prefix}.com\\${var.accounts.dc1_admin_user}"
     }
   PROT
   depends_on = [azurerm_virtual_machine.pc1]