From 20e8f31f696ff5557e3d379550dcd4b1adde36cd Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 23 Oct 2012 10:34:06 -0700 Subject: updated webapp.json and provider.erb to use new domain definition. --- provider/files/service-definitions/provider.json.erb | 2 +- provider/services/webapp.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'provider') diff --git a/provider/files/service-definitions/provider.json.erb b/provider/files/service-definitions/provider.json.erb index e884524..742b88f 100644 --- a/provider/files/service-definitions/provider.json.erb +++ b/provider/files/service-definitions/provider.json.erb @@ -5,7 +5,7 @@ hsh = global.provider.pick(:languages, :description, :name, :enrollment_policy) # typically this is specified in common.json - hsh['domain'] = domain.public + hsh['domain'] = domain.full_suffix # advertise services that are 'user services' hsh['services'] = global.services[:service_type => :user_service].field(:name) diff --git a/provider/services/webapp.json b/provider/services/webapp.json index bfd701d..0e5b2f9 100644 --- a/provider/services/webapp.json +++ b/provider/services/webapp.json @@ -8,8 +8,8 @@ "eip_service": "file('service-definitions/eip-service.json.erb')" }, "service_type": "public_service", - "api_domain": "= 'api.' + domain.public", + "api_domain": "= 'api.' + domain.full_suffix", "dns": { - "aliases": "= [domain.public, api_domain]" + "aliases": "= [domain.full, api_domain]" } } \ No newline at end of file -- cgit v1.2.3