You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/03/16 18:36:09 UTC
[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 <su...@gmail.com>
Authored: Wed Mar 16 13:30:41 2016 -0400
Committer: scnakandala <su...@gmail.com>
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
[2/2] airavata-php-gateway git commit: removing pga_config.php
Posted by sc...@apache.org.
removing pga_config.php
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/b598d4b4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b598d4b4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b598d4b4
Branch: refs/heads/master
Commit: b598d4b4638b5d2123c4251767a171e86bb3215f
Parents: 35ea33d
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 16 13:33:09 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 16 13:33:09 2016 -0400
----------------------------------------------------------------------
app/config/pga_config.php | 238 -----------------------------------------
1 file changed, 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b598d4b4/app/config/pga_config.php
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php b/app/config/pga_config.php
deleted file mode 100644
index fe8316f..0000000
--- a/app/config/pga_config.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-return array(
- /**
- * *****************************************************************
- * WSO2 Identity Server Related Configurations
- * *****************************************************************
- */
-
- 'wsis' => [
-
- /**
- * Admin Role Name
- */
- 'admin-role-name' => 'Internal/everyone',
-
- /**
- * Read only Admin Role Name
- */
- 'read-only-admin-role-name' => 'Internal/everyone',
-
- /**
- * Gateway user role
- */
- 'user-role-name' => 'Internal/everyone',
-
- /**
- * 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',
-
- /**
- * Identity server domain
- */
- 'server' => 'idp.scigap.org',
-
- /**
- * Identity server url
- */
- 'service-url' => 'https://idp.scigap.org:9443/',
-
- /**
- * Enable HTTPS server verification
- */
- 'verify-peer' => true,
-
- /**
- * Path to the server certificate file
- */
- 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
-
- /**
- * Allow self signed server certificates
- */
- 'allow-self-signed-cert' => false
- ],
-
-
- /**
- * *****************************************************************
- * Airavata Client Configurations
- * *****************************************************************
- */
- 'airavata' => [
-
- /**
- * Airavata API server location. Use tls:// as the protocol to
- * connect TLS enabled Airavata
- */
- 'airavata-server' => 'gw56.iu.xsede.org',
-
- /**
- * Airavata API server port
- */
- 'airavata-port' => '8930',
-
- /**
- * 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,
-
- /**
- * absolute path of the data dir
- */
- 'experiment-data-absolute-path' => '/var/www/experimentData',
-
- /**
- * Advanced experiments options
- */
- 'advanced-experiment-options' => '',
-
- /**
- * Default queue name
- */
- 'queue-name' => 'long',
-
- /**
- * Default node count
- */
- 'node-count' => '1',
-
- /**
- * Default total core count
- */
- 'total-cpu-count' => '16',
-
- /**
- * Default wall time limit
- */
- 'wall-time-limit' => '30',
-
- /**
- * Enable app-catalog cache
- */
- 'enable-app-catalog-cache' => true,
-
- /**
- * Life time of app catalog data cache in minutes
- */
- 'app-catalog-cache-duration' => 5,
-
- /**
- * Gateway data store resource id
- */
- 'gateway-data-store-resource-id' => ''
- ],
-
- /**
- * *****************************************************************
- * Portal Related Configurations
- * *****************************************************************
- */
- 'portal' => [
- /**
- * Whether this portal is the SciGaP admin portal
- */
- 'super-admin-portal' => false,
-
- /**
- * Set the name of theme in use here
- */
- 'theme' => 'base',
-
- /**
- * Portal title
- */
- 'portal-title' => 'Airavata PHP Gateway',
-
- /**
- * Email address of the portal admin. Portal admin well get email notifications for events
- * such as new user creation
- */
- 'admin-emails' => ['xxx@xxx.com','yyy@yyy.com'],
-
- /**
- * Email account that the portal should login to send emails
- */
- 'portal-email-username' => 'xyz@abc.com',
-
- /**
- * Password for the portal's email account
- */
- 'portal-email-password' => 'xxxxxxxxxxx',
-
- /**
- * SMTP server on which the portal should connect
- */
- 'portal-smtp-server-host' => 'smtp.gmail.com',
-
- /**
- * SMTP server port on which the portal should connect
- */
- 'portal-smtp-server-port' => '587',
-
- /**
- * Set JIRA Issue Collector scripts here.
- */
- 'jira-help' =>
- [
- /**
- * Report Issue Script issued for your app by Atlassian JIRA
- */
- 'report-issue-script' => '',
- /**
- * Collector id at the end of the above script
- */
- 'report-issue-collector-id' => '',
- /**
- * Create Report Script issued for your app by Atlassian JIRA
- */
- 'request-feature-script' => '',
- /**
- * Collector id at the end of the above script
- */
- 'request-feature-collector-id' => ''
- ],
-
- /**
- * Set Google Analytics Id here. ID format that generates from
- * creating tracker object should be
- *
- * UA-XXXXX-Y
- *
- * for it to be working correctly. Currently it is only set for
- * sending pageviews.
- */
- 'google-analytics-id' => ''
- ]
-);
\ No newline at end of file