diff options
| author | elijah <elijah@riseup.net> | 2014-05-20 13:48:23 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-05-20 14:10:28 -0700 |
| commit | 3919bf8ebb78c07c6c3e067ab2f87f933df8c126 (patch) | |
| tree | 2d0727b22e7ccce42ec230f5b53b038e1730cb6d | |
| parent | 1ea643b6741f41bfd90969d91f384060df98c8ae (diff) | |
add support for webapp on subdomain
| -rw-r--r-- | provider_base/files/service-definitions/provider.json.erb | 2 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index 3e055e9a..be8ae484 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -14,7 +14,7 @@ hsh['api_version'] = "1" hsh['api_uri'] = ["https://", api.domain, ':', api.port].join - hsh['ca_cert_uri'] = 'https://' + domain.full_suffix + '/ca.crt' + hsh['ca_cert_uri'] = 'https://' + webapp.domain + '/ca.crt' 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 6b746fe4..bbb52094 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,6 +1,7 @@ { "webapp": { "admins": [], + "domain": "= domain.full_suffix", "modules": ["user", "billing", "help"], "couchdb_webapp_user": { "username": "= global.services[:couchdb].couch.users[:webapp].username", @@ -41,7 +42,7 @@ }, "service_type": "public_service", "api": { - "domain": "= 'api.' + domain.full_suffix", + "domain": "= 'api.' + webapp.domain", "port": 4430 }, "nickserver": { @@ -54,15 +55,15 @@ "port": 6425 }, "dns": { - "aliases": "= [domain.full_suffix, domain.full, api.domain, nickserver.domain]" + "aliases": "= [domain.full, webapp.domain, api.domain, nickserver.domain]" }, "x509": { "use": true, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'", "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'", - "commercial_cert": "= file [:commercial_cert, domain.full_suffix]", - "commercial_key": "= file [:commercial_key, domain.full_suffix]", + "commercial_cert": "= file [:commercial_cert, webapp.domain]", + "commercial_key": "= file [:commercial_key, webapp.domain]", "commercial_ca_cert": "= try_file :commercial_ca_cert" } } |