diff options
| author | elijah <elijah@riseup.net> | 2013-02-08 21:50:59 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-02-08 21:50:59 -0800 |
| commit | 57adb7f3d527ecd4d3a41b6a1935b93c8266a688 (patch) | |
| tree | 27eb8058b2a56e4850914a6e50cad9490ac53a43 /provider_base | |
| parent | 49fc7e085f635c906b32adfc41a207939be2cf39 (diff) | |
minor changes to default json: give common a name, add contacts.default
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/common.json | 5 | ||||
| -rw-r--r-- | provider_base/provider.json | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 8e4dc6e7..e674edb6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -4,7 +4,7 @@ "tags": [], "domain": { "full_suffix": "= global.provider.domain", - "internal_suffix": "= global.provider.internal_domain", + "internal_suffix": "= global.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)" @@ -29,5 +29,6 @@ "service_type": "internal_service", "development": { "site_config": true - } + }, + "name": "common" } diff --git a/provider_base/provider.json b/provider_base/provider.json index b659d47b..0eae1f87 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -1,12 +1,15 @@ { "domain": "REQUIRED", - "internal_domain": "= domain.sub(/\\..*$/,'.i')", + "domain_internal": "= domain.sub(/\\..*$/,'.i')", "name": { "en": "REQUIRED" }, "description": { "en": "REQUIRED" }, + "contacts": { + "default": "REQUIRED" + }, "languages": ["en"], "default_language": "en", "enrollment_policy": "open", |