diff options
| author | varac <varacanero@zeromail.org> | 2014-03-15 10:24:20 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-03-15 10:24:20 +0100 |
| commit | 49ab166fbe013da6de301a7bb8d1a5128207c3b5 (patch) | |
| tree | 61234b2f1f49fbcfb00ef993a3c25823bbc604fe /provider_base/provider.json | |
| parent | 2f1b09caa23d74b3b778dd285a3456c142d052f8 (diff) | |
| parent | 18121335c200b86a39f83a7cd240258c40a81f4e (diff) | |
Merge remote-tracking branch 'elijah/feature/provider-env' into 0.6
Diffstat (limited to 'provider_base/provider.json')
| -rw-r--r-- | provider_base/provider.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/provider_base/provider.json b/provider_base/provider.json index 8864e24d..fa69318b 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -23,17 +23,17 @@ ], "default_service_level": 1, "bandwidth_limit": 102400, - "allow_free": "= global.provider.service.levels.select {|l| l['rate'].nil?}.any?", - "allow_paid": "= global.provider.service.levels.select {|l| !l['rate'].nil?}.any?", - "allow_anonymous": "= global.provider.service.levels.select {|l| l['name'] == 'anonymous'}.any?", - "allow_registration": "= global.provider.service.levels.select {|l| l['name'] != 'anonymous'}.any?", - "allow_limited_bandwidth": "= global.provider.service.levels.select {|l| l['bandwidth'] == 'limited'}.any?", - "allow_unlimited_bandwidth": "= global.provider.service.levels.select {|l| l['bandwidth'].nil?}.any?" + "allow_free": "= provider.service.levels.select {|l| l['rate'].nil?}.any?", + "allow_paid": "= provider.service.levels.select {|l| !l['rate'].nil?}.any?", + "allow_anonymous": "= provider.service.levels.select {|l| l['name'] == 'anonymous'}.any?", + "allow_registration": "= provider.service.levels.select {|l| l['name'] != 'anonymous'}.any?", + "allow_limited_bandwidth": "= provider.service.levels.select {|l| l['bandwidth'] == 'limited'}.any?", + "allow_unlimited_bandwidth": "= provider.service.levels.select {|l| l['bandwidth'].nil?}.any?" }, "ca": { - "name": "= global.provider.ca.organization + ' Root CA'", - "organization": "= global.provider.name[global.provider.default_language]", - "organizational_unit": "= 'https://' + global.provider.domain", + "name": "= provider.ca.organization + ' Root CA'", + "organization": "= provider.name[provider.default_language]", + "organizational_unit": "= 'https://' + provider.domain", "bit_size": 4096, "digest": "SHA256", "life_span": "10y", |