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/15 20:54:25 UTC
[1/2] airavata-php-gateway git commit: removing ssh username from
input path
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop b4a827e9e -> 5847c98d7
removing ssh username from input path
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/2af83ea9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2af83ea9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2af83ea9
Branch: refs/heads/develop
Commit: 2af83ea9b283c3f43e0053ee3cf1363c03ce5134
Parents: b4a827e
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 15 15:50:32 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 15 15:50:32 2016 -0400
----------------------------------------------------------------------
app/config/pga_config.php.template | 5 -----
app/libraries/ExperimentUtilities.php | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af83ea9/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 411a6d7..fe8316f 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -114,11 +114,6 @@ return array(
'experiment-data-absolute-path' => '/var/www/experimentData',
/**
- * username for the user for accessing the experiment data over ssh
- */
- 'ssh-user' => 'root',
-
- /**
* Advanced experiments options
*/
'advanced-experiment-options' => '',
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af83ea9/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 6b5016c..faca1f9 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -318,7 +318,7 @@ class ExperimentUtilities
$experimentAssemblySuccessful = false;
}
$hostName = $_SERVER['SERVER_NAME'];
- $experimentInput->value = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . $filePath;
+ $experimentInput->value = 'file://' . $hostName . ':' . $filePath;
$experimentInput->type = $applicationInput->type;
} else {
[2/2] airavata-php-gateway git commit: sending experimentDataDir full
path in the experiment config
Posted by sc...@apache.org.
sending experimentDataDir full path in the experiment config
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/5847c98d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5847c98d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5847c98d
Branch: refs/heads/develop
Commit: 5847c98d714745da3b89eb83db4982581c6260f1
Parents: 2af83ea
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 15 15:54:19 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 15 15:54:19 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5847c98d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index faca1f9..0831fba 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -189,7 +189,7 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path($_POST['project'], $_POST['experiment-name']);
}
- $userConfigData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
+ $userConfigData->experimentDataDir = ExperimentUtilities::$experimentPath;
$experiment = new ExperimentModel();
// required