summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-21 16:18:04 -0700
committerelijah <elijah@riseup.net>2012-10-21 16:18:04 -0700
commitaedeea6cd231197985dc4c81ca00f94a25c0e3ab (patch)
tree67f6b5c4cb65879dc7dcf280d4f914b564095bba /test
parent94dd3b4d99a67679adcc3a9921f9e1fa78783cba (diff)
changed domain.public to domain.full_suffix, domain.internal to domain.internal_suffix
Diffstat (limited to 'test')
-rw-r--r--test/provider/common.json8
-rw-r--r--test/provider/files/service-definitions/provider.json.erb2
-rw-r--r--test/provider/services/webapp.json4
3 files changed, 8 insertions, 6 deletions
diff --git a/test/provider/common.json b/test/provider/common.json
index 35147ee..dc2b827 100644
--- a/test/provider/common.json
+++ b/test/provider/common.json
@@ -3,9 +3,11 @@
#
{
"domain": {
- "public": "rewire.co",
- "internal": "rewire",
- "name": "= node.name + '.' + (dns.public ? domain.public : domain.internal)"
+ "full_suffix": "rewire.co",
+ "internal_suffix": "rewire",
+ "full": "= node.name + '.' + domain.full_suffix",
+ "internal": "= node.name + '.' + domain.internal_suffix",
+ "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"
},
"dns": {
"public": "= service_type != 'internal_service'"
diff --git a/test/provider/files/service-definitions/provider.json.erb b/test/provider/files/service-definitions/provider.json.erb
index e884524..742b88f 100644
--- a/test/provider/files/service-definitions/provider.json.erb
+++ b/test/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/test/provider/services/webapp.json b/test/provider/services/webapp.json
index bfd701d..0e5b2f9 100644
--- a/test/provider/services/webapp.json
+++ b/test/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