You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/08/29 17:31:30 UTC
git commit: Fixed issue in NodeJsWebApp preventing add-apt-repository
running
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 187216b74 -> 0e6a093dc
Fixed issue in NodeJsWebApp preventing add-apt-repository running
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0e6a093d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0e6a093d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0e6a093d
Branch: refs/heads/master
Commit: 0e6a093dcc5c2410d8701f2ed6478a4b554fd874
Parents: 187216b
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Aug 29 16:31:10 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Fri Aug 29 16:31:10 2014 +0100
----------------------------------------------------------------------
.../brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java | 2 +-
.../java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0e6a093d/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java
index 83aace7..7b4e8ce 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java
@@ -55,7 +55,7 @@ public class NodeJsWebAppServiceImpl extends SoftwareProcessImpl implements Node
ConfigToAttributes.apply(this);
- HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getAttribute(Attributes.HTTP_PORT));
+ HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getHttpPort());
String nodeJsUrl = String.format("http://%s:%d", accessible.getHostText(), accessible.getPort());
LOG.info("Connecting to {}", nodeJsUrl);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0e6a093d/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
index 839d434..e8f243d 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
@@ -86,7 +86,7 @@ public class NodeJsWebAppSshDriver extends AbstractSoftwareProcessSshDriver impl
List<String> commands = MutableList.<String>builder()
.add(BashCommands.INSTALL_CURL)
.add(BashCommands.ifExecutableElse0("apt-get", BashCommands.chain(
- BashCommands.installPackage("python-software-properties python g++ make"),
+ BashCommands.installPackage("software-properties-common python-software-properties python g++ make"),
BashCommands.sudo("add-apt-repository ppa:chris-lea/node.js"))))
.add(BashCommands.installPackage(MutableMap.of("yum", "git nodejs npm", "apt", "git-core nodejs"), null))
.add(BashCommands.sudo("npm install -g n"))