From 42d6d0ee967775060eb700fa1328185dccae72c5 Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Wed, 26 Apr 2023 15:41:43 +0100 Subject: [PATCH] feat(proxy): use group name in dns for smart origins --- app/terraform/proxy/cloudfront.py | 3 ++- terraform-modules/terraform-aws-bc-smart-proxy-instance | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/terraform/proxy/cloudfront.py b/app/terraform/proxy/cloudfront.py index 3d163ca..42929f1 100644 --- a/app/terraform/proxy/cloudfront.py +++ b/app/terraform/proxy/cloudfront.py @@ -14,6 +14,7 @@ class ProxyCloudfrontAutomation(ProxyAutomation): cloud_name = "aws" template_parameters = [ + "admin_email", "aws_access_key", "aws_secret_key", "smart_zone" @@ -92,7 +93,7 @@ class ProxyCloudfrontAutomation(ProxyAutomation): module "cloudfront_{{ proxy.id }}" { source = "{{ terraform_modules_path }}/terraform-aws-bc-proxy" {% if proxy.origin.smart %} - origin_domain = "origin-{{ proxy.origin.id }}.smart.{{ smart_zone[:-1] }}" + origin_domain = "origin-{{ proxy.origin.id }}.{{ proxy.origin.group.group_name }}.smart.{{ smart_zone[:-1] }}" {% else %} origin_domain = "{{ proxy.origin.domain_name }}" {% endif %} diff --git a/terraform-modules/terraform-aws-bc-smart-proxy-instance b/terraform-modules/terraform-aws-bc-smart-proxy-instance index b3f386e..4f5cee2 160000 --- a/terraform-modules/terraform-aws-bc-smart-proxy-instance +++ b/terraform-modules/terraform-aws-bc-smart-proxy-instance @@ -1 +1 @@ -Subproject commit b3f386eeb1e9e6cc558509ab863d325b51d4ed18 +Subproject commit 4f5cee28bb35a9698fe8949db383ca7239366b93