summaryrefslogtreecommitdiff
path: root/provider_base/common.json
diff options
context:
space:
mode:
Diffstat (limited to 'provider_base/common.json')
-rw-r--r--provider_base/common.json13
1 files changed, 4 insertions, 9 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 5e689109..893d5daf 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -29,12 +29,7 @@
"x509": {
"use": true,
"use_commercial": false,
- "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, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr --domain %s` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.' % (try{webapp.domain}||domain.full_suffix)) : 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 --domain %s` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.' % (try{webapp.domain}||domain.full_suffix)) : nil",
- "commercial_ca_cert": "= x509.use_commercial ? try_file(:commercial_ca_cert) : nil"
+ "ca_cert": "= try_file :ca_cert"
},
"service_type": "internal_service",
"development": {
@@ -64,9 +59,9 @@
},
"sources": {
"apt": {
- "basic": "http://httpredir.debian.org/debian/",
+ "basic": "http://deb.debian.org/debian/",
"security": "http://security.debian.org/",
- "backports": "http://httpredir.debian.org/debian/"
+ "backports": "http://deb.debian.org/debian/"
},
"leap-mx": {
"type": "apt",
@@ -76,7 +71,7 @@
"nickserver": {
"type": "git",
"source": "https://leap.se/git/nickserver",
- "revision": "origin/version/0.8"
+ "revision": "origin/version/0.9"
},
"platform": {
"apt": {