You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/05 14:19:26 UTC
[1/2] brooklyn-library git commit: change config for 2.0.0
Repository: brooklyn-library
Updated Branches:
refs/heads/master eb11975bc -> 6caaad48c
change config for 2.0.0
Use the chttpd section for binding ip and setting port
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/81a7abba
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/81a7abba
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/81a7abba
Branch: refs/heads/master
Commit: 81a7abba13fee11e51b552293c32b43968838c42
Parents: eb11975
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Fri May 5 14:59:38 2017 +0100
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Fri May 5 14:59:38 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java | 4 ++++
.../resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/81a7abba/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java
index 8f39f45..8f96dcb 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java
@@ -245,6 +245,10 @@ public class CouchDBNodeSshDriver extends AbstractSoftwareProcessSshDriver imple
.execute();
}
+ public String getBindSection() {
+ return isV2() ? "chttpd": "httpd";
+ }
+
private String getZypperRepository() {
OsDetails osDetails = getMachine().getMachineDetails().getOsDetails();
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/81a7abba/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
index f9dfc64..51766e0 100644
--- a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
+++ b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
@@ -5,7 +5,7 @@ database_dir = ${driver.runDir}
view_index_dir = ${driver.runDir}
uri_file = ${driver.runDir}/couch.uri
-[httpd]
+[${driver.bindSection}]
port = ${entity.httpPort?c}
bind_address = 0.0.0.0
[2/2] brooklyn-library git commit: This closes #105
Posted by dr...@apache.org.
This closes #105
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6caaad48
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6caaad48
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6caaad48
Branch: refs/heads/master
Commit: 6caaad48ca89462128f73a206b486f3b0155fb51
Parents: eb11975 81a7abb
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Fri May 5 15:18:55 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Fri May 5 15:18:55 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/nosql/couchdb/CouchDBNodeSshDriver.java | 4 ++++
.../resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------