diff options
| author | azul <azul@riseup.net> | 2014-04-25 12:15:37 +0200 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2014-04-25 12:15:37 +0200 |
| commit | 76ad25ba0ee344f185f8e8cdfe066685cd3b0447 (patch) | |
| tree | d8122b5b5144c917f5e1924c1428a3a871e94149 /config | |
| parent | 2b6200f508ddb8e1c8a76fd3778881c39d787d8d (diff) | |
| parent | be81b7430e0a2046125be7c3a4b01b8725f4afe6 (diff) | |
Merge pull request #148 from azul/feature/api-quota-support
Feature/api quota support + current_user null pattern
Diffstat (limited to 'config')
| -rw-r--r-- | config/defaults.yml | 12 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index e7d0f5e..47cb641 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -49,21 +49,15 @@ common: &common service_levels: &service_levels service_levels: - 0: - name: anonymous - cert_prefix: "LIMITED" - description: "anonymous account, with rate limited VPN" 1: name: free - cert_prefix: "LIMITED" description: "free account, with rate limited VPN" - cost: 0 - quota: 100 + eip_rate_limit: true + storage: 100 2: name: premium - cert_prefix: "UNLIMITED" description: "premium account, with unlimited vpn" - cost: + rate: USD: 10 EUR: 10 default_service_level: 1 diff --git a/config/routes.rb b/config/routes.rb index b930bd1..f612b47 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,6 +25,7 @@ LeapWeb::Application.routes.draw do resources :users, :only => [:create, :update, :destroy, :index] resources :messages, :only => [:index, :update] resource :cert, :only => [:show] + resource :service, :only => [:show] end scope "(:locale)", :locale => MATCH_LOCALE do |