[airavata] branch master updated: Google Analytics ID in ansible pga_config.php template

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 27ea5d5  Google Analytics ID in ansible pga_config.php template
     new 6cee9a2  Merge branch 'google-analytics-ansible'
27ea5d5 is described below

commit 27ea5d50ae806d82abe2b07755729c949283c908
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Dec 7 12:40:41 2017 -0500

    Google Analytics ID in ansible pga_config.php template
---
 .../ansible/inventories/scigap/production/pga_config/seagrid/vars.yml   | 1 +
 dev-tools/ansible/roles/pga/defaults/main.yml                           | 1 +
 dev-tools/ansible/roles/pga/templates/pga_config.php.j2                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index afe9550..8a84014 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -68,4 +68,5 @@ portal_email_password: "{{ vault_portal_email_password }}"
 portal_theme: "seagrid"
 portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
 portal_title: "SEAGrid Portal"
+pga_google_analytics_id: "UA-110457476-1"
 ...
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index e7b91f8..c84f20b 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -87,4 +87,5 @@ portal_email_password: "airavata12"
 portal_theme: "base"
 portal_theme_repo: ""
 portal_title: "Airavata PHP Gateway"
+pga_google_analytics_id: ""
 ...
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index f4a60e9..bbd9c59 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -275,6 +275,6 @@ return array(
          * for it to be working correctly. Currently it is only set for
          * sending pageviews.
          */
-        'google-analytics-id' => ''
+        'google-analytics-id' => '{{ pga_google_analytics_id }}'
     ]
 );

-- 
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].