diff options
| author | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
| commit | b4077083b971377636754b2988668a6ddd384da5 (patch) | |
| tree | b8e358b5f0f6dfa882d31d7446266111bc0d201b /provider_base/services/ca.json | |
| parent | 625aaa11138bba365958391664299692402f8da4 (diff) | |
| parent | 672154a8322901b86c9882854234eae53221a38e (diff) | |
Merge remote-tracking branch 'origin/develop'0.2.2
Conflicts:
provider_base/services/webapp.json
Diffstat (limited to 'provider_base/services/ca.json')
| -rw-r--r-- | provider_base/services/ca.json | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json deleted file mode 100644 index 3fb8bf6c..00000000 --- a/provider_base/services/ca.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ca_daemon": { - "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]", - "couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]" - }, - "service_type": "internal_service", - "x509": { - "use": true, - "ca_key": "= file(:ca_key, :missing => 'CA key. Run `leap cert ca` to create the Certificate Authority.')" - } -} |