diff options
| author | elijah <elijah@riseup.net> | 2013-12-18 00:10:01 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-12-20 10:56:01 -0800 |
| commit | 34ac576bf7efbddac0a89731292eac8974f95114 (patch) | |
| tree | edc2b821602e5ea0310ae185eef4e9d6e710c843 /config | |
| parent | 76517637ddf70577bd2a14bebb8a57552fbb1776 (diff) | |
enable billing engine by default, consolidate APP_CONFIG[:payments] and APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree]
Diffstat (limited to 'config')
| -rw-r--r-- | config/defaults.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index 260915e..a1b6235 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -44,6 +44,7 @@ common: &common # see /users/app/views/users/_edit.html.haml for a list. user_actions: ['destroy_account'] admin_actions: ['change_pgp_key', 'change_service_level', 'destroy_account'] + billing: ~ service_levels: &service_levels service_levels: @@ -75,7 +76,6 @@ development: admins: [blue, admin, admin2] domain: example.org secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - payment: [] reraise_errors: true test: @@ -87,8 +87,8 @@ test: admins: [admin, admin2] domain: test.me secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - payment: [billing] reraise_errors: true + billing: true production: <<: *downloads @@ -96,5 +96,4 @@ production: <<: *common admins: [] domain: example.net - payment: [] # logfile: /path/to/your/logs |