diff options
| author | elijah <elijah@riseup.net> | 2012-12-19 12:12:16 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-12-19 12:12:16 -0800 |
| commit | c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba (patch) | |
| tree | 87a6e1ed0f61fe90fb6b089d695f6de897119128 /provider_base | |
| parent | 109334ec46ffdde3a96119fd6108080bd1d45c8a (diff) | |
webapp api now uses a customizable port (so that we don't try to rely on SNI for hosting two TLS domains on one IP).
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/files/service-definitions/provider.json.erb | 2 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index c19e5538..f26f25a2 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -11,7 +11,7 @@ hsh['services'] = global.services[:service_type => :user_service].field(:name) hsh['api_version'] = "1" - hsh['api_uri'] = "https://" + api_domain + hsh['api_uri'] = "https://" + api.domain + ':' + api.port hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt' hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert) diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 3eb0ba62..e40ed0ca 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -9,9 +9,12 @@ "eip_service": "= file :eip_service_json_template" }, "service_type": "public_service", - "api_domain": "= 'api.' + domain.full_suffix", + "api": { + "domain": "= 'api.' + domain.full_suffix", + "port": "4430" + }, "dns": { - "aliases": "= [domain.full, api_domain]" + "aliases": "= [domain.full, api.domain]" }, "x509": { "use": true, |