From 05d3c0903f48e9c0d69145c9e027b70a392c9602 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 27 Nov 2012 12:27:35 -0800 Subject: fix webapp: only list couchdb hosts that match node's 'local' value. --- provider_base/common.json | 3 ++- provider_base/services/webapp.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'provider_base') diff --git a/provider_base/common.json b/provider_base/common.json index 12b9dab6..6d4291c6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -22,5 +22,6 @@ "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", "ca_cert": "= try_file :ca_cert" - } + }, + "local": false } diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 321c26ea..afb51ee1 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,7 +1,7 @@ { "webapp": { "modules": ["user", "billing", "help"], - "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')", + "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')", "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { -- cgit v1.2.3