From 81aa446545820eced996b3bd9c8ca956667fa504 Mon Sep 17 00:00:00 2001 From: tosih Date: Wed, 24 Aug 2016 14:06:25 -0700 Subject: [PATCH 1/3] Pass intercom app id in environment for Grunt build instead of hardcoded. --- ansible/delta-hosts/variables | 3 +++ ansible/gamma-hosts/variables | 3 +++ ansible/group_vars/alpha-web.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index 11ef3cca..28074110 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -174,3 +174,6 @@ sg_services=sg-71d2fe15 sg_userland=sg-41d2fe25 sg_web=sg-51d2fe35 vpc_id=vpc-864c6be3 + +[web:vars] +web_intercom_id=wqzm3rju diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 6ea63ca5..da906202 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -155,3 +155,6 @@ sg_redis=sg-477b0c23 sg_registry=sg-c8d140af sg_userland=sg-12ce9876 sg_web=sg-fe8bf49a + +[web:vars] +web_intercom_id=xs5g95pd diff --git a/ansible/group_vars/alpha-web.yml b/ansible/group_vars/alpha-web.yml index 8aa8f3c4..733f8300 100644 --- a/ansible/group_vars/alpha-web.yml +++ b/ansible/group_vars/alpha-web.yml @@ -17,6 +17,7 @@ dockerfile_enviroment: [ "MARKETING_URL {{ marketing_url }}", "STRIPE_TOKEN {{ cream_stripe_publishable_key }}", "NODE_ENV production", + "INTERCOM_APP_ID {{ web_intercom_id }}", "USER_CONTENT_DOMAIN {{ user_content_domain }}", ] From ea183aae4ea1c0beefcd4e9fd70756bef539796c Mon Sep 17 00:00:00 2001 From: tosih Date: Wed, 24 Aug 2016 14:07:43 -0700 Subject: [PATCH 2/3] Added intercom app id for epsilon --- ansible/epsilon-hosts/variables | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/epsilon-hosts/variables b/ansible/epsilon-hosts/variables index f765a430..845c1a3c 100644 --- a/ansible/epsilon-hosts/variables +++ b/ansible/epsilon-hosts/variables @@ -146,3 +146,6 @@ sg_registry="sg-a16ef8c6" sg_userland="sg-8f20e6e8" sg_web="sg-cb20e6ac" vpc_id="vpc-cdb2a3a8" + +[web:vars] +web_intercom_id=xs5g95pd From 4c41ebf4baf6a067c7b95b0fddcf012910b9bb53 Mon Sep 17 00:00:00 2001 From: tosih Date: Wed, 24 Aug 2016 16:19:12 -0700 Subject: [PATCH 3/3] Sort alphabetically. --- ansible/group_vars/alpha-web.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/alpha-web.yml b/ansible/group_vars/alpha-web.yml index 733f8300..41eb00cb 100644 --- a/ansible/group_vars/alpha-web.yml +++ b/ansible/group_vars/alpha-web.yml @@ -14,10 +14,10 @@ dockerfile_enviroment: [ "AWS_ACCESS_KEY {{ aws_access_key }}", "AWS_BUCKET app.{{ domain }}", "AWS_SECRET_KEY {{ aws_secret_key }}", + "INTERCOM_APP_ID {{ web_intercom_id }}", "MARKETING_URL {{ marketing_url }}", - "STRIPE_TOKEN {{ cream_stripe_publishable_key }}", "NODE_ENV production", - "INTERCOM_APP_ID {{ web_intercom_id }}", + "STRIPE_TOKEN {{ cream_stripe_publishable_key }}", "USER_CONTENT_DOMAIN {{ user_content_domain }}", ]