summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-12-07 14:48:55 +0100
committervarac <varacanero@zeromail.org>2012-12-07 14:48:55 +0100
commit51f37d8132a44e25350db66b7156892980d3e4fa (patch)
tree4b25713bb91d9d306068965d6c3bb3f4efb81b4c
parent450c3ba29c0e8d3a3c8cf1946aa71160b3c48897 (diff)
ca -> ca_daemon in site.pp and services/ca.json
-rw-r--r--provider_base/services/ca.json2
-rw-r--r--puppet/manifests/site.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index f3758ab6..800c995d 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,5 +1,5 @@
{
- "ca": {
+ "ca_daemon": {
"couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
"couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
},
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 304e989d..c8502bc7 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -24,6 +24,6 @@ node 'default' {
}
if 'ca' in $services {
- include site_ca
+ include site_ca_daemon
}
}