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 E668918449 for ; Tue, 15 Mar 2016 19:54:25 +0000 (UTC) Received: (qmail 10481 invoked by uid 500); 15 Mar 2016 19:54:25 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 10428 invoked by uid 500); 15 Mar 2016 19:54:25 -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 10418 invoked by uid 99); 15 Mar 2016 19:54:25 -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; Tue, 15 Mar 2016 19:54:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 61414DF9F5; Tue, 15 Mar 2016 19:54:25 +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: Tue, 15 Mar 2016 19:54:25 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Mar 15 15:50:32 2016 -0400 Committer: scnakandala 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 {