Repository: airavata-php-gateway Updated Branches: refs/heads/master d91248804 -> d6fe629bf
hiding static-working-dir 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/d6fe629b Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d6fe629b Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d6fe629b Branch: refs/heads/master Commit: d6fe629bf0ce56a804b9ff69a1f9ceb121125651 Parents: d912488 Author: scnakandala <[email protected]> Authored: Wed Jan 13 11:51:30 2016 -0500 Committer: scnakandala <[email protected]> Committed: Wed Jan 13 11:51:30 2016 -0500 ---------------------------------------------------------------------- app/config/pga_config.php | 224 +++++++++++++++++++ app/libraries/ExperimentUtilities.php | 2 +- .../partials/experiment-queue-block.blade.php | 14 +- 3 files changed, 232 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/config/pga_config.php ---------------------------------------------------------------------- diff --git a/app/config/pga_config.php b/app/config/pga_config.php new file mode 100644 index 0000000..cfdd6b0 --- /dev/null +++ b/app/config/pga_config.php @@ -0,0 +1,224 @@ +<?php +return array( + /** + * ***************************************************************** + * These are WSO2 Identity Server Related Configurations + * ***************************************************************** + */ + + 'wsis' => [ + + /** + * Admin Role Name + */ + 'admin-role-name' => 'Internal/everyone', + + /** + * Read only Admin Role Name + */ + 'read-only-admin-role-name' => 'admin-read-only', + + /** + * Gateway user role + */ + 'user-role-name' => 'airavata-user', + + /** + * 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' => 'O3iUdkkVYyHgzWPiVTQpY_tb96Ma', + + /** + * OAuth client secret + */ + 'oauth-client-secret' => '6Ck1jZoa2oRtrzodSqkUZ2iINkUa', + + /** + * Identity server domain + */ + 'server' => 'idp.scigap.org', + + /** + * Identity server url + */ + 'service-url' => 'https://idp.scigap.org:7443/', + + /** + * 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 + ], + + + /** + * ***************************************************************** + * These are Airavata Related Configurations + * ***************************************************************** + */ + 'airavata' => [ + + /** + * Airavata API server location. Use tls:// as the protocol to + * connect TLS enabled Airavata + */ + 'airavata-server' => 'gw77.iu.xsede.org', + + /** + * Airavata API server port + */ + 'airavata-port' => '8930', + + /** + * Airavata API server thrift communication timeout + */ + 'airavata-timeout' => '1000000', + + /** + * Data Manager CPI server host + */ + 'data-manager-server' => 'localhost', + + /** + * Data Manager CPI server port + */ + 'data-manager-port' => '8990', + + /** + * Data Manager CPI server thrift communication timeout + */ + 'data-manager-timeout' => '1000000', + + /** + * PGA Gateway ID + */ + 'gateway-id' => 'seagrid', + + /** + * 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' => '/Library/WebServer/Documents/experimentData', + + /** + * username for the user for accessing the experiment data over ssh + */ + 'ssh-user' => 'root', + + /** + * 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 super admin portal + */ + 'super-admin-portal' => true, + + /** + * Set the name of theme in use here + */ + 'theme' => 'base', + + /** + * Portal titles + */ + 'portal-title' => 'Airavata PHP Gateway', + + /** + * Email addresses of the portal admins. Portal admins well get email notifications for events + * such as new user creation + */ + 'admin-emails' => ['[email protected]','[email protected]'], + + /** + * Email account that the portal should login to send emails + */ + 'portal-email-username' => '[email protected]', + + /** + * Password for the portal's email account + */ + 'portal-email-password' => 'airavata12', + + /** + * 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' + ] +); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php index 1598eba..5c881a4 100644 --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@ -181,7 +181,7 @@ class ExperimentUtilities $scheduling->wallTimeLimit = $_POST['wall-time']; $scheduling->totalPhysicalMemory = $_POST['total-physical-memory']; $scheduling->resourceHostId = $_POST['compute-resource']; - $scheduling->staticWorkingDir = $_POST['static-working-dir']; +// $scheduling->staticWorkingDir = $_POST['static-working-dir']; $userConfigData = new UserConfigurationDataModel(); $userConfigData->computationalResourceScheduling = $scheduling; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/views/partials/experiment-queue-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php index af2390b..c585ea2 100644 --- a/app/views/partials/experiment-queue-block.blade.php +++ b/app/views/partials/experiment-queue-block.blade.php @@ -59,13 +59,13 @@ <span class="input-group-addon">MB</span> </div> </div> - <div class="form-group"> - <label for="static-working-dir">Static Working Directory<span - class="static-working-dir alert-warning"></span></label> - <input type="text" class="form-control" name="static-working-dir" id="static-working-dir" - value="@if(isset($expVal) ){{ $expVal['scheduling']->staticWorkingDir }}@endif" - @if(isset($expVal)) @if(!$expVal['editable']){{"disabled"}} @endif @endif> - </div> + {{--<div class="form-group">--}} + {{--<label for="static-working-dir">Static Working Directory<span--}} + {{--class="static-working-dir alert-warning"></span></label>--}} + {{--<input type="text" class="form-control" name="static-working-dir" id="static-working-dir"--}} + {{--value="@if(isset($expVal) ){{ $expVal['scheduling']->staticWorkingDir }}@endif"--}} + {{--@if(isset($expVal)) @if(!$expVal['editable']){{"disabled"}} @endif @endif>--}} + {{--</div>--}} </div>
