Merge pull request #114 from DFE-Digital/692-new-service-template-imp…

…rovements [692] New service template improvements
DFE-Digital · Nov 21, 2023 · a63313a · a63313a
2 parents a48582a + 38fe1b4
commit a63313a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/templates/new_service/.gitignore b/templates/new_service/.gitignore
@@ -3,3 +3,4 @@ terraform/application/vendor
 terraform/domains/environment_domains/vendor
 terraform.tfstate*
 bin/terrafile
+bin/konduit.sh
diff --git a/templates/new_service/Makefile b/templates/new_service/Makefile
@@ -87,10 +87,10 @@ domains-infra-init: bin/terrafile domains composed-variables set-azure-account
 		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
 		-backend-config=key=domains_infrastructure.tfstate
 
-domains-infra-plan: domains domains-infra-init  ## Terraform plan for DNS infrastructure (zone and front door. Usage: make domains-infra-plan
+domains-infra-plan: domains domains-infra-init  ## Terraform plan for DNS infrastructure (DNS zone and front door). Usage: make domains-infra-plan
 	terraform -chdir=terraform/domains/infrastructure plan -var-file config/zones.tfvars.json
 
-domains-infra-apply: domains domains-infra-init  ## Terraform apply for DNS infrastructure (zone and front door). Usage: make domains-infra-apply
+domains-infra-apply: domains domains-infra-init  ## Terraform apply for DNS infrastructure (DNS zone and front door). Usage: make domains-infra-apply
 	terraform -chdir=terraform/domains/infrastructure apply -var-file config/zones.tfvars.json ${AUTO_APPROVE}
 
 domains-init: bin/terrafile domains composed-variables set-azure-account
@@ -101,10 +101,10 @@ domains-init: bin/terrafile domains composed-variables set-azure-account
 		-backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \
 		-backend-config=key=${ENVIRONMENT}.tfstate
 
-domains-plan: domains-init  ## Terraform plan for DNS environment domains. Usage: make development domains domains-plan
+domains-plan: domains-init  ## Terraform plan for DNS environment domains. Usage: make development domains-plan
 	terraform -chdir=terraform/domains/environment_domains plan -var-file config/${CONFIG}.tfvars.json
 
-domains-apply: domains-init ## Terraform apply for DNS environment domains. Usage: make development domains domains-apply
+domains-apply: domains-init ## Terraform apply for DNS environment domains. Usage: make development domains-apply
 	terraform -chdir=terraform/domains/environment_domains apply -var-file config/${CONFIG}.tfvars.json ${AUTO_APPROVE}
 
 test-cluster:

diff --git a/templates/new_service/terraform/application/config/development_Terrafile b/templates/new_service/terraform/application/config/development_Terrafile
@@ -1,3 +1,3 @@
 aks:
     source:  "https://github.com/DFE-Digital/terraform-modules"
-    version: "main"
+    version: "testing"
diff --git a/templates/new_service/terraform/application/config/production_Terrafile b/templates/new_service/terraform/application/config/production_Terrafile
@@ -1,3 +1,3 @@
 aks:
     source:  "https://github.com/DFE-Digital/terraform-modules"
-    version: "main"
+    version: "stable"
diff --git a/templates/new_service/terraform/application/database.tf b/templates/new_service/terraform/application/database.tf
@@ -28,4 +28,5 @@ module "redis-cache" {
   use_azure                 = var.deploy_azure_backing_services
   azure_enable_monitoring   = var.enable_monitoring
   azure_patch_schedule      = [{ "day_of_week" : "Sunday", "start_hour_utc" : 01 }]
+  server_version            = "6"
 }
diff --git a/templates/new_service/terraform/application/output.tf b/templates/new_service/terraform/application/output.tf
@@ -1,3 +1,3 @@
 output "url" {
-  value = "https://${module.web_application.hostname}/"
+  value = module.web_application.url
 }
diff --git a/templates/new_service/terraform/domains/infrastructure/config/zones.tfvars.json b/templates/new_service/terraform/domains/infrastructure/config/zones.tfvars.json
@@ -2,11 +2,7 @@
     "hosted_zone": {
       "#DNS_ZONE_NAME#": {
         "caa_records": {},
-        "txt_records": {
-          "_dmarc": {
-            "value": "v=DMARC1;p=reject;sp=reject;adkim=s;aspf=s;fo=1;rua=mailto:[email protected],mailto:[email protected];ruf=mailto:[email protected]"
-          }
-        },
+        "txt_records": {},
         "resource_group_name": "#DOMAINS_RESOURCE_GROUP_NAME#",
         "front_door_name": "#FRONT_DOOR_NAME#"
       }