summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-23 10:34:06 -0700
committerelijah <elijah@riseup.net>2012-10-23 10:34:06 -0700
commit20e8f31f696ff5557e3d379550dcd4b1adde36cd (patch)
treec2efca4463bc69dc72ad12a4720c415c6d3abc8c
parent3ff0d42f98ce12d9504ec853e483fde641f08f79 (diff)
updated webapp.json and provider.erb to use new domain definition.
-rw-r--r--provider/files/service-definitions/provider.json.erb2
-rw-r--r--provider/services/webapp.json4
2 files changed, 3 insertions, 3 deletions
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