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 E334919BE0 for ; Wed, 16 Mar 2016 17:36:09 +0000 (UTC) Received: (qmail 42369 invoked by uid 500); 16 Mar 2016 17:36:09 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 42324 invoked by uid 500); 16 Mar 2016 17:36:09 -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 42239 invoked by uid 99); 16 Mar 2016 17:36:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2016 17:36:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 946D4DFB8A; Wed, 16 Mar 2016 17:36:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Wed, 16 Mar 2016 17:36:09 -0000 Message-Id: <05b24c9fed4d4b8cb4773e58455a599d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] airavata-php-gateway git commit: removing commit mistake file Repository: airavata-php-gateway Updated Branches: refs/heads/master 76a936eaa -> b598d4b46 removing commit mistake file Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/35ea33d5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/35ea33d5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/35ea33d5 Branch: refs/heads/master Commit: 35ea33d5fc2551464b6a3bccab07a9efea8797da Parents: 76a936e Author: scnakandala Authored: Wed Mar 16 13:30:41 2016 -0400 Committer: scnakandala Committed: Wed Mar 16 13:30:41 2016 -0400 ---------------------------------------------------------------------- app/config/pga_config.php | 56 ++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/35ea33d5/app/config/pga_config.php ---------------------------------------------------------------------- diff --git a/app/config/pga_config.php b/app/config/pga_config.php index cc8f53d..fe8316f 100644 --- a/app/config/pga_config.php +++ b/app/config/pga_config.php @@ -11,67 +11,42 @@ return array( /** * Admin Role Name */ - 'admin-role-name' => 'sg_admin', + 'admin-role-name' => 'Internal/everyone', /** * Read only Admin Role Name */ - 'read-only-admin-role-name' => 'sg_admin_read_only', + 'read-only-admin-role-name' => 'Internal/everyone', /** * Gateway user role */ - 'user-role-name' => 'sg_user', + 'user-role-name' => 'Internal/everyone', /** * Tenant Domain */ - 'tenant-domain' => 'prod.seagrid', + 'tenant-domain' => 'master.airavata', /** * Tenant admin's username */ - 'admin-username' => 'admin', + 'admin-username' => 'master', /** * Tenant admin's password */ - 'admin-password' => 'seagr1d_@dmin', + 'admin-password' => 'master', /** * OAuth client key */ - 'oauth-client-key' => 'y7xgdnNUx6ifOswJTPcqtzw4aOEa', + 'oauth-client-key' => '5_GFR88Nzd4XvGthSMF1fnOJPuMa', /** * OAuth client secret */ - 'oauth-client-secret' => 'CgfbuupAPhaOBSBPSScZUWHNANwa', - -// /** -// * Tenant Domain -// */ -// 'tenant-domain' => 'master.airavata', -// -// /** -// * Tenant admin's username -// */ -// 'admin-username' => 'master', -// -// /** -// * Tenant admin's password -// */ -// 'admin-password' => 'master', -// -// /** -// * OAuth client key -// */ -// 'oauth-client-key' => '5_GFR88Nzd4XvGthSMF1fnOJPuMa', -// -// /** -// * OAuth client secret -// */ -// 'oauth-client-secret' => 'KNTf_LPLuGBDbRVZwkrP_fF5z2Ea', + 'oauth-client-secret' => 'KNTf_LPLuGBDbRVZwkrP_fF5z2Ea', /** * Identity server domain @@ -126,7 +101,7 @@ return array( /** * PGA Gateway ID */ - 'gateway-id' => 'seagrid', + 'gateway-id' => 'default', /** * Maximum size of a file which is allowed to upload to the server @@ -136,7 +111,7 @@ return array( /** * absolute path of the data dir */ - 'experiment-data-absolute-path' => '/Users/supun', + 'experiment-data-absolute-path' => '/var/www/experimentData', /** * Advanced experiments options @@ -171,7 +146,12 @@ return array( /** * Life time of app catalog data cache in minutes */ - 'app-catalog-cache-duration' => 5 + 'app-catalog-cache-duration' => 5, + + /** + * Gateway data store resource id + */ + 'gateway-data-store-resource-id' => '' ], /** @@ -188,7 +168,7 @@ return array( /** * Set the name of theme in use here */ - 'theme' => 'seagrid', + 'theme' => 'base', /** * Portal title @@ -255,4 +235,4 @@ return array( */ 'google-analytics-id' => '' ] -); +); \ No newline at end of file