fix git ignore + monitoring

Ontotext-AD · Oct 31, 2024 · 727bb13 · 727bb13
1 parent 54feb6b
commit 727bb13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,20 +55,4 @@ terraform.rc
 *.license
 
 #Private key
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-privatekey.key
-=======
-privatekey.key
->>>>>>> 3884dac (Add the rest of the changes)
-=======
-privatekey.key
->>>>>>> 50ed20e (Fix comments from Viktor)
-=======
-privatekey.key
->>>>>>> 3884dac (Add the rest of the changes)
-=======
-privatekey.key
->>>>>>> 50ed20e (Fix comments from Viktor)
+*.key
diff --git a/main.tf b/main.tf
@@ -230,7 +230,9 @@ module "monitoring" {
   web_test_availability_request_url = var.disable_agw ? var.graphdb_external_address_fqdn : module.application_gateway[0].public_ip_address_fqdn
   web_test_geo_locations            = var.web_test_geo_locations
   web_test_ssl_check_enabled        = var.web_test_ssl_check_enabled
-  graphdb_external_address_fqdn     = var.graphdb_external_address_fqdn != null ? var.graphdb_external_address_fqdn : module.application_gateway.public_ip_address_fqdn
+
+  #graphdb_external_address_fqdn     = var.graphdb_external_address_fqdn != null ? var.graphdb_external_address_fqdn : module.application_gateway.public_ip_address_fqdn
+  graphdb_external_address_fqdn = var.graphdb_external_address_fqdn != null ? var.graphdb_external_address_fqdn : module.application_gateway[0].public_ip_address_fqdn
 
   monitor_reader_principal_id = var.monitor_reader_principal_id