summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-10 14:20:58 -0800
committerelijah <elijah@riseup.net>2016-02-10 14:20:58 -0800
commit23e65fd524674f65f75651147c5c787382f20909 (patch)
tree17dcb81e2ad3e77dadb49571a831707d024a9fbf
parent81ab07d79a56c6b44d2ca16fb51af2a0e8d09098 (diff)
resolves #7646: leap_cli should fail when soledad and couchdb service are seperated
-rw-r--r--provider_base/services/soledad.json1
-rw-r--r--provider_base/services/soledad.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index 99390d17..169588c8 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -1,7 +1,6 @@
{
"soledad": {
"port": 2323,
- "require_couchdb": "=> assert %(services.include? 'couchdb')",
"couchdb_soledad_user": {
"username": "= global.services[:couchdb].couch.users[:soledad].username",
"password": "= secret :couch_soledad_password",
diff --git a/provider_base/services/soledad.rb b/provider_base/services/soledad.rb
new file mode 100644
index 00000000..b55e90b6
--- /dev/null
+++ b/provider_base/services/soledad.rb
@@ -0,0 +1,3 @@
+unless self.services.include? "couchdb"
+ LeapCli.log :error, "service `soledad` requires service `couchdb` on the same node (node #{self.name})."
+end \ No newline at end of file