summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-03-16 23:15:14 -0700
committerelijah <elijah@riseup.net>2013-03-16 23:15:14 -0700
commit4ec32a1f773918b2c7a42c117fbad110c07df458 (patch)
treef41cadb572aeb955ba798739d08772a1f047b317 /provider_base
parent8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (diff)
the development tag now specifies an alternative provider domain. this requires that we use domain.full_suffix instead of provider.domain, whenever possible.
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/files/service-definitions/provider.json.erb2
-rw-r--r--provider_base/services/webapp.json4
-rw-r--r--provider_base/tags/development.json6
3 files changed, 8 insertions, 4 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb
index f26f25a2..2ca34548 100644
--- a/provider_base/files/service-definitions/provider.json.erb
+++ b/provider_base/files/service-definitions/provider.json.erb
@@ -13,7 +13,7 @@
hsh['api_version'] = "1"
hsh['api_uri'] = "https://" + api.domain + ':' + api.port
- hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt'
+ hsh['ca_cert_uri'] = 'https://' + domain.full_suffix + '/ca.crt'
hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert)
generate_json hsh
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ea79d7c4..5e7260a6 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -29,8 +29,8 @@
"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",
- "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
- "commercial_key": "= file [:commercial_key, global.provider.domain]",
+ "commercial_cert": "= file [:commercial_cert, domain.full_suffix]",
+ "commercial_key": "= file [:commercial_key, domain.full_suffix]",
"commercial_ca_cert": "= try_file :commercial_ca_cert"
}
} \ No newline at end of file
diff --git a/provider_base/tags/development.json b/provider_base/tags/development.json
index caf18e9d..6d4f9e25 100644
--- a/provider_base/tags/development.json
+++ b/provider_base/tags/development.json
@@ -1,3 +1,7 @@
{
- "environment": "development"
+ "environment": "development",
+ "domain": {
+ "full_suffix": "= 'dev.' + global.provider.domain",
+ "internal_suffix": "= 'dev.' + global.provider.domain_internal"
+ }
} \ No newline at end of file