revert bootstrap-qs

appgateways/appgw-qs/logs.tf

@@ -5,9 +5,9 @@ resource "azurerm_monitor_diagnostic_setting" "example" {
 
     log_analytics_workspace_id = var.log_analytics_workspace_id
 
-    log {
+    enabled_log {
         category = "ApplicationGatewayAccessLog"
-        enabled  = true
+        enabled= true
 
         retention_policy {
             enabled = true
@@ -15,7 +15,7 @@ resource "azurerm_monitor_diagnostic_setting" "example" {
         }
     }
 
-    log {
+    enabled_log {
         category = "ApplicationGatewayFirewallLog"
         enabled  = true
 

vm-qs/main.tf

@@ -13,6 +13,8 @@ resource "random_password" "password" {
   override_special = "_!@"
   upper = true
   lower = true
+  numeric = true
+  min_numeric = 2
   min_lower = 2
   min_upper = 2
   min_special = 2
@@ -24,6 +26,8 @@ resource "random_password" "qlikpassword" {
   override_special = "_!@"
   upper = true
   lower = true
+  numeric = true
+  min_numeric = 2
   min_lower = 2
   min_upper = 2
   min_special = 2
@@ -95,21 +99,6 @@ resource "azurerm_windows_virtual_machine" "vm" {
     "ShutdownTime": var.is_24x7 == false? var.shutdownTime : null
     "StartupTime": var.is_24x7 == false? var.startupTime : null
   }
-
-  provisioner "file" {
-    connection {
-      type     = "winrm"
-      host     = module.qmi-nic.private_ip_address
-      user     = local.admin_username
-      password = local.admin_password
-      port     = 5985
-      https    = false
-      timeout  = "30m"
-    }
-    source      = "${path.module}/main"
-    destination = "C:/provision"
-  }
-
 }
 
 
@@ -148,6 +137,7 @@ resource "null_resource" "vm-qs-post" {
   }*/
 
   provisioner "remote-exec" {
+    
     connection {
       type     = "winrm"
       host     = module.qmi-nic.private_ip_address
@@ -159,10 +149,10 @@ resource "null_resource" "vm-qs-post" {
     }
 
     inline = [
-      "powershell.exe -NoProfile -File C:/provision/prep-files.ps1 -scenario vm-qs",
-      "powershell.exe -NoProfile -File C:/provision/bootstrap-qs.ps1 -ModuleName vm-qs",
-      "powershell.exe -NoProfile -File C:/provision/qs-post-cfg.ps1 -Hostname ${var.resource_group_name}.qmi.qlik-poc.com -Serial ${local.serial} -Control ${local.control} -CertPwd \"${local.cert_password}\" -QlikUserPwd ${local.qlikpassword}",
-      "powershell.exe -NoProfile -File C:/provision/q-WebConnectors.ps1",
+      "powershell -NoProfile -File C:\\Temp\\prep-files.ps1 -scenario vm-qs",
+      "powershell -NoProfile -File C:\\provision\\bootstrap-qs.ps1 -ModuleName vm-qs",
+      "powershell -NoProfile -File C:\\provision\\qs-post-cfg.ps1 -Hostname ${var.resource_group_name}.qmi.qlik-poc.com -Serial ${local.serial} -Control ${local.control} -CertPwd \"${local.cert_password}\" -QlikUserPwd ${local.qlikpassword}",
+      "powershell -NoProfile -File C:\\provision\\q-WebConnectors.ps1",
     ]
   }