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 43F2F18B85 for ; Sat, 6 Jun 2015 02:22:14 +0000 (UTC) Received: (qmail 82785 invoked by uid 500); 6 Jun 2015 02:22:14 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 82745 invoked by uid 500); 6 Jun 2015 02:22:14 -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 82736 invoked by uid 99); 6 Jun 2015 02:22:14 -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; Sat, 06 Jun 2015 02:22:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06E66E08DD; Sat, 6 Jun 2015 02:22:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Message-Id: <8c8cd7ce8c98466aa782bcd0e5f02abf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata-php-gateway git commit: the config files should not be in repo, instead committing a template Date: Sat, 6 Jun 2015 02:22:13 +0000 (UTC) Repository: airavata-php-gateway Updated Branches: refs/heads/master f3d7e2b45 -> a88115a63 the config files should not be in repo, instead committing a template 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/a88115a6 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a88115a6 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a88115a6 Branch: refs/heads/master Commit: a88115a63110be4e9d969c41dd6b1cfbd82dfde4 Parents: f3d7e2b Author: Suresh Marru Authored: Fri Jun 5 22:22:06 2015 -0400 Committer: Suresh Marru Committed: Fri Jun 5 22:22:06 2015 -0400 ---------------------------------------------------------------------- app/config/pga_config.php | 135 -------------------------------- app/config/pga_config.php.template | 135 ++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a88115a6/app/config/pga_config.php ---------------------------------------------------------------------- diff --git a/app/config/pga_config.php b/app/config/pga_config.php deleted file mode 100644 index 27ec861..0000000 --- a/app/config/pga_config.php +++ /dev/null @@ -1,135 +0,0 @@ - [ - - /** - * Admin Role Name - */ - 'admin-role-name' => 'admin', - - /** - * Gateway user role - */ - 'user-role-name' => 'Internal/everyone', - - /** - * Tenant admin's username - */ - 'admin-username' => 'test@testphprg.scigap.org', - - /** - * Tenant admin's password - */ - 'admin-password' => 'testadmin@scigap.org', - - /** - * Identity server domain - */ - 'server' => 'idp.scigap.org', - - /** - * Identity server web services endpoint - */ - 'service-url' => 'https://idp.scigap.org:7443/services/', - - /** - * Gateway domain name - */ - 'gateway-id' => 'default', - - /** - * Path to the server certificate file - */ - 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem', - - /** - * Enable HTTPS server verification - */ - 'verify-peer' => true, - - /** - * Allow self signed server certificates - */ - 'allow-self-signed-cert' => false - ], - - - /** - * ***************************************************************** - * These are Airavata Related Configurations - * ***************************************************************** - */ - 'airavata' => [ - /** - * Airavata API server location - */ - 'airavata-server' => 'gw111.iu.xsede.org', - - /** - * Airavata API server port - */ - 'airavata-port' => '9930', - - /** - * Airavata API server thrift communication timeout - */ - 'airavata-timeout' => '1000000', - - /** - * PGA Gateway ID - */ - 'gateway-id' => 'default', - - /** - * Maximum size of a file which is allowed to upload to the server - */ - 'server-allowed-file-size' => 64, - - /** - * directory in the web server where experiment data is staged. This path should be a relative path from app root - */ - 'experiment-data-root' => '/../experimentData/', - - /** - * Advanced experiments options - */ - 'advanced-experiment-options' => '', - - /** - * Credentials Store Token - */ - 'credential-store-token' => 'bdc612fe-401e-4684-88e9-317f99409c45', - - /** - * Default queue name - */ - 'queue-name' => 'long', - - /** - * Default node count - */ - 'node-count' => '1', - - /** - * Default total core count - */ - 'total-cpu-count' => '4', - - /** - * Default wall time limit - */ - 'wall-time-limit' => '30', - - /** - * Life time of app catalog data cache in minutes - */ - 'app-catalog-cache-duration' => 5 - ] - -); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a88115a6/app/config/pga_config.php.template ---------------------------------------------------------------------- diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template new file mode 100644 index 0000000..27ec861 --- /dev/null +++ b/app/config/pga_config.php.template @@ -0,0 +1,135 @@ + [ + + /** + * Admin Role Name + */ + 'admin-role-name' => 'admin', + + /** + * Gateway user role + */ + 'user-role-name' => 'Internal/everyone', + + /** + * Tenant admin's username + */ + 'admin-username' => 'test@testphprg.scigap.org', + + /** + * Tenant admin's password + */ + 'admin-password' => 'testadmin@scigap.org', + + /** + * Identity server domain + */ + 'server' => 'idp.scigap.org', + + /** + * Identity server web services endpoint + */ + 'service-url' => 'https://idp.scigap.org:7443/services/', + + /** + * Gateway domain name + */ + 'gateway-id' => 'default', + + /** + * Path to the server certificate file + */ + 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem', + + /** + * Enable HTTPS server verification + */ + 'verify-peer' => true, + + /** + * Allow self signed server certificates + */ + 'allow-self-signed-cert' => false + ], + + + /** + * ***************************************************************** + * These are Airavata Related Configurations + * ***************************************************************** + */ + 'airavata' => [ + /** + * Airavata API server location + */ + 'airavata-server' => 'gw111.iu.xsede.org', + + /** + * Airavata API server port + */ + 'airavata-port' => '9930', + + /** + * Airavata API server thrift communication timeout + */ + 'airavata-timeout' => '1000000', + + /** + * PGA Gateway ID + */ + 'gateway-id' => 'default', + + /** + * Maximum size of a file which is allowed to upload to the server + */ + 'server-allowed-file-size' => 64, + + /** + * directory in the web server where experiment data is staged. This path should be a relative path from app root + */ + 'experiment-data-root' => '/../experimentData/', + + /** + * Advanced experiments options + */ + 'advanced-experiment-options' => '', + + /** + * Credentials Store Token + */ + 'credential-store-token' => 'bdc612fe-401e-4684-88e9-317f99409c45', + + /** + * Default queue name + */ + 'queue-name' => 'long', + + /** + * Default node count + */ + 'node-count' => '1', + + /** + * Default total core count + */ + 'total-cpu-count' => '4', + + /** + * Default wall time limit + */ + 'wall-time-limit' => '30', + + /** + * Life time of app catalog data cache in minutes + */ + 'app-catalog-cache-duration' => 5 + ] + +); \ No newline at end of file