From commits-return-18660-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Mon Dec 11 21:09:52 2017 Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 453D517F69 for ; Mon, 11 Dec 2017 21:09:52 +0000 (UTC) Received: (qmail 60282 invoked by uid 500); 11 Dec 2017 21:09:52 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 60225 invoked by uid 500); 11 Dec 2017 21:09:52 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 60215 invoked by uid 99); 11 Dec 2017 21:09:52 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2017 21:09:52 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 341B78204A; Mon, 11 Dec 2017 21:09:49 +0000 (UTC) Date: Mon, 11 Dec 2017 21:09:49 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch master updated: Google Analytics ID in ansible pga_config.php template MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151302658967.3768.1823840285987934590@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 236455fdc2cd611e46e76eefa4716c74cbbbf444 X-Git-Newrev: 27ea5d50ae806d82abe2b07755729c949283c908 X-Git-Rev: 27ea5d50ae806d82abe2b07755729c949283c908 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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" '].