Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 55 insertions, 1 deletions

diff --git a/config/defaults.yml b/config/defaults.yml
index 8d81668..260915e 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -13,34 +13,88 @@ cert_options: &cert_options
   limited_cert_prefix: "LIMITED"
   unlimited_cert_prefix: "UNLIMITED"
 
+downloads: &downloads
+  client_download_domain: https://downloads.leap.se
+  available_clients:
+    - linux32
+    - linux64
+    - osx
+    - windows
+    - android
+  download_paths:
+    android: /client/android/Bitmask-Android-latest.apk
+    linux:   /client/linux
+    linux32: /client/linux/Bitmask-linux32-latest.tar.bz2
+    linux64: /client/linux/Bitmask-linux64-latest.tar.bz2
+    osx:     /client/osx/Bitmask-OSX-latest.dmg
+    windows: /client/windows/Bitmask-win32-latest.zip
+    other:   /client
+
 common: &common
   force_ssl: false
   pagination_size: 30
   auth:
     token_expires_after: 60
+  # handles that will be blocked from being used as logins or email aliases
+  # in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
+  handle_blacklist: [certmaster, ssladmin, arin-admin, administrator, www-data, maildrop]
+  # handles that will be allowed despite being in /etc/passwd or rfc2142
+  handle_whitelist: []
+  # actions enabled in the account settings
+  # 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']
+
+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
+    2:
+      name: premium
+      cert_prefix: "UNLIMITED"
+      description: "premium account, with unlimited vpn"
+      cost:
+        USD: 10
+        EUR: 10
+  default_service_level: 1
 
 development:
+  <<: *downloads
   <<: *dev_ca
   <<: *cert_options
   <<: *common
+  <<: *service_levels
   admins: [blue, admin, admin2]
   domain: example.org
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   payment: []
+  reraise_errors: true
 
 test:
+  <<: *downloads
   <<: *dev_ca
   <<: *cert_options
   <<: *common
+  <<: *service_levels
   admins: [admin, admin2]
   domain: test.me
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   payment: [billing]
+  reraise_errors: true
 
 production:
+  <<: *downloads
   <<: *cert_options
   <<: *common
   admins: []
   domain: example.net
   payment: []
-# logfile: /path/to/your/logs
+  # logfile: /path/to/your/logs