diff options
| author | elijah <elijah@riseup.net> | 2014-06-25 15:22:02 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-25 15:22:02 -0700 |
| commit | a9e85045bb312db3dff560c1ca1f40d669cd71bf (patch) | |
| tree | 76ed7fade9638b57660817cecd0a815321d18b95 /provider_base | |
| parent | 1bf4dff125fb7d164d12ba9645241a5fd8f76a3a (diff) | |
fix commercial cert usage with mx and monitor nodes.
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/common.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 565633c0..1f0c6730 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -29,8 +29,8 @@ "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap cert update`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil", "ca_cert": "= try_file :ca_cert", - "commercial_cert": "= x509.use_commercial ? file([:commercial_cert, webapp.domain], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", - "commercial_key": "= x509.use_commercial ? file([:commercial_key, webapp.domain], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", + "commercial_cert": "= x509.use_commercial ? file([:commercial_cert, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", + "commercial_key": "= x509.use_commercial ? file([:commercial_key, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", "commercial_ca_cert": "= x509.use_commercial ? try_file(:commercial_ca_cert) : nil" }, "service_type": "internal_service", |