Merge pull request #6 from TechHoldingLLC/update-config

Update cache config

Author: piyushsonigra

cloudfront.tf

@@ -4,14 +4,15 @@ resource "aws_cloudfront_distribution" "cloudfront" {
   web_acl_id      = var.web_acl_id #tfsec:ignore:aws-cloudfront-enable-waf
   comment         = var.comment
   http_version    = var.http_version
-  is_ipv6_enabled = var.ipv6
+  is_ipv6_enabled = var.is_ipv6_enabled
 
   dynamic "origin" {
     for_each = [var.origin]
 
     content {
       domain_name = origin.value.domain_name
       origin_id   = origin.value.origin_id
+      origin_path = lookup(origin.value, "origin_path", "")
 
       dynamic "s3_origin_config" {
         for_each = length(keys(lookup(origin.value, "s3_origin_config", {}))) > 0 ? [lookup(origin.value, "s3_origin_config")] : []
@@ -28,7 +29,7 @@ resource "aws_cloudfront_distribution" "cloudfront" {
           origin_protocol_policy = custom_origin_config.value.origin_protocol_policy
           http_port              = lookup(custom_origin_config.value, "http_port", 80)
           https_port             = lookup(custom_origin_config.value, "https_port", 443)
-          origin_ssl_protocols   = lookup(custom_origin_config.value, "origin_ssl_protocols", ["TLSv1", "TLSv1.1", "TLSv1.2"])
+          origin_ssl_protocols   = lookup(custom_origin_config.value, "origin_ssl_protocols", ["TLSv1.2"])
         }
       }
 
@@ -60,10 +61,10 @@ resource "aws_cloudfront_distribution" "cloudfront" {
     origin_request_policy_id = var.origin_request_policy_id
 
     viewer_protocol_policy = var.viewer_protocol_policy
-    compress               = true
-    min_ttl                = lookup(var.ttl_values, "min_ttl", 0)
-    max_ttl                = lookup(var.ttl_values, "max_ttl", 86400)
-    default_ttl            = lookup(var.ttl_values, "default_ttl", 3600)
+    compress               = var.compress
+    min_ttl                = lookup(var.ttl_values, "min_ttl", null)
+    max_ttl                = lookup(var.ttl_values, "max_ttl", null)
+    default_ttl            = lookup(var.ttl_values, "default_ttl", null)
 
     dynamic "forwarded_values" {
       for_each = var.cache_policy_id != "" ? [] : [1]

variables.tf

@@ -22,6 +22,12 @@ variable "custom_error_response" {
   default     = []
 }
 
+variable "compress" {
+  description = "Compress file"
+  type = bool
+  default = false
+}
+
 variable "default_root_object" {
   description = "Default root object"
   type        = string
@@ -92,7 +98,7 @@ variable "http_version" {
   default     = "http2"
 }
 
-variable "ipv6" {
+variable "is_ipv6_enabled" {
   description = "ipv6 status"
   type        = bool
   default     = false