diff options
| author | elijah <elijah@riseup.net> | 2015-08-19 17:41:45 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-08-19 17:41:45 -0700 |
| commit | 3f1c9f42cd93f6ef099124b33663fd9f288eb430 (patch) | |
| tree | 56d5837dbd5aa33552ed0ec8e88c7e3ce69d0503 /provider_base | |
| parent | 1b4c55b308eda73504769c38972da9b2f1295e99 (diff) | |
allow ca_cert_uri to be configured
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 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index e51f9c3a..a75bea61 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -9,7 +9,7 @@ hsh['api_version'] = "1" hsh['api_uri'] = ["https://", api.domain, ':', api.port].join - hsh['ca_cert_uri'] = 'https://' + webapp.domain + '/ca.crt' + hsh['ca_cert_uri'] = api.ca_cert_uri hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert) hsh.dump_json diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 081b3718..7b1ca8fb 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -55,7 +55,8 @@ "service_type": "public_service", "api": { "domain": "= 'api.' + webapp.domain", - "port": 4430 + "port": 4430, + "ca_cert_uri": "= 'https://' + webapp.domain + '/ca.crt'" }, "nickserver": { "domain": "= 'nicknym.' + domain.full_suffix", |