From aedeea6cd231197985dc4c81ca00f94a25c0e3ab Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 21 Oct 2012 16:18:04 -0700
Subject: changed domain.public to domain.full_suffix, domain.internal to
 domain.internal_suffix

---
 test/provider/common.json                                 | 8 +++++---
 test/provider/files/service-definitions/provider.json.erb | 2 +-
 test/provider/services/webapp.json                        | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'test/provider')

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
-- 
cgit v1.2.3