summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 11:51:43 +0200
committervarac <varacanero@zeromail.org>2013-09-19 11:51:43 +0200
commite2ea69580ff9417efb7a85e8190d331051323ff3 (patch)
tree3e67e75e932d683084863c5bae5981ed17c98964 /provider_base
parentca3f34da520ff835d383aa82f528adf927d3364f (diff)
parent1f9003eb6ed90400279011d477e6143e2eb6e2db (diff)
Merge branch 'feature/3832_Unify_x509_certs,_keys_and_ca' into develop
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/services/mx.json4
-rw-r--r--provider_base/services/webapp.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index 25ccf4f0..f999dd23 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -12,8 +12,8 @@
"x509": {
"use": true,
"ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
- "client_ca_cert": "= file_path :client_ca_cert",
- "client_ca_key": "= file_path :client_ca_key",
+ "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
+ "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'",
"commercial_cert": "= file [:commercial_cert, domain.full_suffix]",
"commercial_key": "= file [:commercial_key, domain.full_suffix]",
"commercial_ca_cert": "= try_file :commercial_ca_cert"
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ee61e5ab..e47f047b 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -45,8 +45,8 @@
"x509": {
"use": true,
"ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
- "client_ca_cert": "= file_path :client_ca_cert",
- "client_ca_key": "= file_path :client_ca_key",
+ "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
+ "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'",
"commercial_cert": "= file [:commercial_cert, domain.full_suffix]",
"commercial_key": "= file [:commercial_key, domain.full_suffix]",
"commercial_ca_cert": "= try_file :commercial_ca_cert"