summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-12-07 15:52:50 -0800
committerelijah <elijah@riseup.net>2012-12-07 15:52:50 -0800
commit6af460dd3b2e686734df876eff9b621f2162da69 (patch)
tree328a1793ea4bff7801f8a31c9caaafdc923e2d1b /provider_base/services
parentb525a1799808959f702441b330ff3ab5de8fdf75 (diff)
added hostname tracking and late evaluation. new key "hosts" added, for building /etc/hosts. also, now ssh.known_hosts only includes what is necessary.
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/ca.json2
-rw-r--r--provider_base/services/webapp.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index 800c995d..a4ded72b 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,6 +1,6 @@
{
"ca_daemon": {
- "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
+ "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
"couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
},
"service_type": "internal_service",
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index b04ed684..3eb0ba62 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][:local => local].field('domain.name')",
+ "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
"couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
},
"definition_files": {