diff --git a/app/terraform/proxy/__init__.py b/app/terraform/proxy/__init__.py index 69d2173..b8a8035 100644 --- a/app/terraform/proxy/__init__.py +++ b/app/terraform/proxy/__init__.py @@ -138,20 +138,18 @@ class ProxyAutomation(TerraformAutomation): subs_filter https://{{ origin.domain_name }}/ /; subs_filter "(https:)?//tags.{{ origin.normalised_domain_name }}/" / r; subs_filter "(https:)?//ssc.{{ origin.normalised_domain_name }}/" / r; - subs_filter ssc.{{ origin.normalised_domain_name }} bbg.sc.omtrdc.net; - + subs_filter return"http"+(a.ssl?"s":"")+"://"+b+"/b/ss/ return"/b/ss/; + } + + location ~ /b/ss/(.+)$ { + proxy_set_header Accept-Encoding ""; + proxy_ssl_server_name on; + proxy_pass https://bbg.sc.omtrdc.net/b/ss/$1; + subs_filter_types text/html text/css text/xml application/javascript image/gif; + subs_filter //bbg.sc.omtrdc.net/ /; + subs_filter https://{{ origin.domain_name }}/ /; + subs_filter "(https:)?//ssc.{{ origin.normalised_domain_name }}/" / r; } - # This configuration block is commented out while we work on a solution with the analytics team - # from USAGM - # location ~ /b/ss/(.+)$ { - # proxy_set_header Accept-Encoding ""; - # proxy_ssl_server_name on; - # proxy_pass https://bbg.sc.omtrdc.net/b/ss/$1; - # subs_filter_types text/html text/css text/xml application/javascript image/gif; - # subs_filter //bbg.sc.omtrdc.net/ /; - # subs_filter https://{{ origin.domain_name }}/ /; - # subs_filter "(https:)?//ssc.{{ origin.normalised_domain_name }}/" / r; - # } location / { proxy_set_header Accept-Encoding ""; proxy_ssl_server_name on;