summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-22 17:07:44 +0100
committervarac <varacanero@zeromail.org>2012-11-22 17:07:44 +0100
commitd051fc7ed2460199fe6a92f2454f91c439a928a5 (patch)
tree3428b6691f8b5ef0026c8f85d531f51cfb8c45d7 /provider_base
parent96d60568648555e28effd1398a791241a7ad3f7a (diff)
parent9491f15a64c13f2424b781d32d5734db3bb4a22f (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/common.json2
-rw-r--r--provider_base/services/webapp.json4
2 files changed, 4 insertions, 2 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 4e85c9b0..0eeef6e5 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -20,7 +20,7 @@
"use": false,
"cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil",
"key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil",
- "ca_cert": "= file :ca_cert"
+ "ca_cert": "= try_file :ca_cert"
},
"local": "= self.vagrant?"
}
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ca9edf33..bdef5761 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -15,7 +15,9 @@
},
"x509": {
"use": true,
+ "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'",
"commercial_cert": "= file [:commercial_cert, global.provider.domain]",
- "commercial_key": "= file [:commercial_key, global.provider.domain]"
+ "commercial_key": "= file [:commercial_key, global.provider.domain]",
+ "commercial_ca_cert": "= try_file :commercial_ca_cert"
}
} \ No newline at end of file