Skip to content

Commit

Permalink
set correct default ini address for multicouch and change from couchd…
Browse files Browse the repository at this point in the history
…b's default port
  • Loading branch information
Caolan McMahon committed Apr 7, 2013
1 parent 6e841bb commit 4f5eb52
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions lib/hoodie-app.js
Expand Up @@ -25,7 +25,7 @@ var domain = "dev";
var package_json = JSON.parse(fs.readFileSync("./package.json"));
var name = package_json.name.toLowerCase();

var couch_port = process.env.COUCH_PORT || 5984;
var couch_port = process.env.COUCH_PORT || 8081;
var couch_url = "http://couch." + name + "." + domain + ":80";
if (process.platform === 'linux') {
couch_url = 'http://localhost:' + couch_port;
Expand All @@ -43,13 +43,21 @@ if (process.platform === 'linux') {
hoodie_apps_path = path.resolve(hoodie_path, 'apps');
}

var couch_bin = process.env.COUCH_BIN;
var couch_bin = process.env.COUCH_BIN,
couch_default_ini = process.env.COUCH_DEFAULT_INI;

if (!couch_bin) {
if (fs.existsSync('/usr/local/bin/couchdb')) {
couch_bin = '/usr/local/bin/couchdb';
if (!couch_default_ini) {
couch_default_ini = '/usr/local/etc/couchdb/default.ini';
}
}
else if (fs.existsSync('/usr/bin/couchdb')) {
couch_bin = '/usr/bin/couchdb';
if (!couch_default_ini) {
couch_default_ini = '/etc/couchdb/default.ini';
}
}
else {
console.log('no couchdb installation found');
Expand All @@ -73,7 +81,7 @@ if(process.env.SUBDOMAIN) { // we are on nodejitsu
domain = "jit.su";
couch_url = process.env.COUCH_URL;
// TODO: verify couchdb_url is reachable
couch_port = 5984;
couch_port = 8081;
if(!couch_url) {
throw "FATAL: NO COUCH URL"
}
Expand Down Expand Up @@ -102,7 +110,8 @@ if(process.env.SUBDOMAIN) { // we are on nodejitsu
var couchdb = new MultiCouch({
prefix: path.join(hoodie_apps_path, name),
port: couch_port,
couchdb_path: couch_bin
couchdb_path: couch_bin,
default_sys_ini: couch_default_ini
});

couchdb.on("start", function() {
Expand Down

0 comments on commit 4f5eb52

Please sign in to comment.