From b9369292cb19f97aafaaaac9f89bf2374487936b Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 18 Apr 2014 12:59:59 +0200 Subject: bring service_levels into webapp config - #5527 including the default_service_level --- provider_base/services/webapp.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 29c0cbf9..6b746fe4 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -12,6 +12,8 @@ "allow_limited_certs": "= provider.service.allow_limited_bandwidth", "allow_unlimited_certs": "= provider.service.allow_unlimited_bandwidth", "allow_anonymous_certs": "= provider.service.allow_anonymous", + "default_service_level": "= provider.service.default_service_level", + "service_levels": "= provider.service.levels", "secret_token": "= secret :webapp_secret_token", "api_version": 1, "secure": false, -- cgit v1.2.3 From 3919bf8ebb78c07c6c3e067ab2f87f933df8c126 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 20 May 2014 13:48:23 -0700 Subject: add support for webapp on subdomain --- provider_base/services/webapp.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'provider_base/services/webapp.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" } } -- cgit v1.2.3