summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--provider_base/common.json3
-rw-r--r--provider_base/services/ca.json2
-rw-r--r--provider_base/services/couchdb.json1
-rw-r--r--provider_base/tags/development.json3
-rw-r--r--provider_base/tags/local.json2
-rw-r--r--provider_base/tags/production.json2
6 files changed, 8 insertions, 5 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index e674edb6..dc59b88e 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -1,5 +1,6 @@
{
"ip_address": null,
+ "environment": null,
"services": [],
"tags": [],
"domain": {
@@ -24,8 +25,6 @@
"key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil",
"ca_cert": "= try_file :ca_cert"
},
- "local": false,
- "production": false,
"service_type": "internal_service",
"development": {
"site_config": true
diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index 3fb8bf6c..64866ddc 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,6 +1,6 @@
{
"ca_daemon": {
- "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
+ "couchdb_hosts": "= hostnames nodes_like_me[:services => :couchdb]",
"couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
},
"service_type": "internal_service",
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index e7668286..c3502c6b 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -4,6 +4,7 @@
"use": true
},
"couch": {
+ "port": 5984,
"bigcouch": {
"cookie": "= secret :bigcouch_cookie"
},
diff --git a/provider_base/tags/development.json b/provider_base/tags/development.json
new file mode 100644
index 00000000..caf18e9d
--- /dev/null
+++ b/provider_base/tags/development.json
@@ -0,0 +1,3 @@
+{
+ "environment": "development"
+} \ No newline at end of file
diff --git a/provider_base/tags/local.json b/provider_base/tags/local.json
index 9cb16602..48312b33 100644
--- a/provider_base/tags/local.json
+++ b/provider_base/tags/local.json
@@ -1,3 +1,3 @@
{
- "local": true
+ "environment": "local"
} \ No newline at end of file
diff --git a/provider_base/tags/production.json b/provider_base/tags/production.json
index b35c0650..ea17498f 100644
--- a/provider_base/tags/production.json
+++ b/provider_base/tags/production.json
@@ -1,3 +1,3 @@
{
- "production": true
+ "environment": "production"
} \ No newline at end of file