diff options
| author | elijah <elijah@riseup.net> | 2014-06-25 12:49:39 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-25 12:49:39 -0700 |
| commit | fba004bc8cbee0d9556538342ce78ac1c9d1229b (patch) | |
| tree | e7a74fec9706554c9820b3121f0d82b64e5a26f4 /provider_base/services/mx.json | |
| parent | c20aa4f8c35a4cba982de92105da2566ecdfa1ae (diff) | |
more friendly error message in `leap compile` when commercial certificate is missing.
Diffstat (limited to 'provider_base/services/mx.json')
| -rw-r--r-- | provider_base/services/mx.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 731dee9a..30a19d9a 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -13,12 +13,10 @@ "mynetworks": "= nodes['environment' => '!local'].map{|name, n| [n.ip_address, (global.facts[name]||{})['ec2_public_ipv4']]}.flatten.compact.uniq", "x509": { "use": true, + "use_commercial": true, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", "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" + "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'" }, "service_type": "user_service" } |