merging to prod

.github/workflows/terraform_prod.yaml

@@ -3,7 +3,7 @@ name: "Production - Terraform Infrastructure"
 on:
  push:
    branches:
-    - main
+    - prod
    paths:
     - infra/envs/prod/**
     - infra/modules/**

infra/envs/prod/backend.tf

@@ -22,7 +22,6 @@ terraform {
 }
 
 provider "aws" {
-  # alias = "main"
   region  = "eu-west-1"
   # profile = var.PROFILE
   default_tags {

infra/envs/prod/modules.tf

@@ -11,4 +11,8 @@ module "cvalexmav_web" {
   service_group = "CV_Website"
   environment   = "Production"
 
+  providers = {
+    aws.virginia = aws.virginia
+  }
+
 }

infra/envs/test/backend.tf

@@ -24,7 +24,7 @@ terraform {
 provider "aws" {
   # alias = "main"
   region  = "eu-west-1"
-  # profile = var.PROFILE
+  # profile = "alexm"
   default_tags {
     tags = {
       Terraform    = "TRUE"

infra/envs/test/modules.tf

@@ -4,11 +4,14 @@ module "testalexmav_web" {
   bucket_name = "test.alexmav.co.uk"
 
   enable_website = true
-
-  domain_acm = "cv.alexmav.co.uk"
+  
+  domain_acm = "test.alexmav.co.uk"
 
   # Tags
   service_group = "Test_Website"
   environment   = "Development"
 
+  providers = {
+    aws.virginia = aws.virginia
+  }
 }

infra/modules/web/cloudfront.tf

@@ -1,5 +1,7 @@
 data "aws_acm_certificate" "this" {
   domain = var.domain_acm
+
+  provider = aws.virginia
 }
 
 resource "aws_cloudfront_origin_access_identity" "this" {
@@ -80,7 +82,7 @@ resource "aws_cloudfront_distribution" "this" {
 
     min_ttl                = 0
     default_ttl            = 3600
-    max_ttl                = 7200
+    max_ttl                = 86400
     compress               = true
     viewer_protocol_policy = "redirect-to-https"
   }
@@ -97,8 +99,8 @@ resource "aws_cloudfront_distribution" "this" {
 
   #First, create certificate, before pasting the ARN here. 
   viewer_certificate {
-    # acm_certificate_arn            = data.aws_acm_certificate.this.arn
-    cloudfront_default_certificate = true
+    acm_certificate_arn            = data.aws_acm_certificate.this.arn
+    cloudfront_default_certificate = false
     minimum_protocol_version       = "TLSv1.2_2021"
     ssl_support_method             = "sni-only"
   }