diff options
| author | elijah <elijah@riseup.net> | 2012-11-27 12:27:35 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-11-27 12:27:35 -0800 |
| commit | 05d3c0903f48e9c0d69145c9e027b70a392c9602 (patch) | |
| tree | 71ccbfea29656d35cdcb07550be5ed0c28b6172a /provider_base | |
| parent | be2300a01a7744986d6ea76b44c663df619aae03 (diff) | |
fix webapp: only list couchdb hosts that match node's 'local' value.
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/common.json | 3 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 2 |
2 files changed, 3 insertions, 2 deletions
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": { |