diff options
| author | elijah <elijah@riseup.net> | 2015-08-07 18:08:14 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-08-07 18:08:14 -0700 |
| commit | e6f6324ebea9fc46d5d617a08c2eb239349d9f90 (patch) | |
| tree | 76334f2889abd9348cd38aa8600dfc6115e30b4d /provider_base/provider.json | |
| parent | fc082470fa945dd5a394057cbea8ea55831b9fad (diff) | |
move 'enabled service' calculation to a macro.
Diffstat (limited to 'provider_base/provider.json')
| -rw-r--r-- | provider_base/provider.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/provider_base/provider.json b/provider_base/provider.json index 9b6e73ca..81b2ea98 100644 --- a/provider_base/provider.json +++ b/provider_base/provider.json @@ -14,6 +14,7 @@ "languages": ["en"], "default_language": "en", "enrollment_policy": "open", + "services": "= enabled_services", "service": { // bandwidth limit is in Bytes, storage limit is in MB. // for example: @@ -31,7 +32,7 @@ "bandwidth_limit": 102400, "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_anonymous": "= provider.service.levels.select {|l| l['name'] == 'anonymous'}.any? && services.include?('openvpn')", "allow_registration": "= provider.enrollment_policy != 'closed' && 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?" |