summaryrefslogtreecommitdiff
path: root/provider_base/common.json
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-15 10:24:20 +0100
committervarac <varacanero@zeromail.org>2014-03-15 10:24:20 +0100
commit49ab166fbe013da6de301a7bb8d1a5128207c3b5 (patch)
tree61234b2f1f49fbcfb00ef993a3c25823bbc604fe /provider_base/common.json
parent2f1b09caa23d74b3b778dd285a3456c142d052f8 (diff)
parent18121335c200b86a39f83a7cd240258c40a81f4e (diff)
Merge remote-tracking branch 'elijah/feature/provider-env' into 0.6
Diffstat (limited to 'provider_base/common.json')
-rw-r--r--provider_base/common.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 07a58bba..a4d9c5f2 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -3,10 +3,10 @@
"environment": null,
"services": [],
"tags": [],
- "contacts": "= global.provider.contacts.default",
+ "contacts": "= provider.contacts.default",
"domain": {
- "full_suffix": "= global.provider.domain",
- "internal_suffix": "= global.provider.domain_internal",
+ "full_suffix": "= provider.domain",
+ "internal_suffix": "= provider.domain_internal",
"full": "= node.name + '.' + domain.full_suffix",
"internal": "= node.name + '.' + domain.internal_suffix",
"name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)"