From 7a9ece43bd61246b450471ed6bb1089570321e38 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 17 Apr 2014 19:27:47 +0200
Subject: make use of the UnauthorizedUser

Null Pattern for current_user - use it to get rid of some conditionals
---
 config/defaults.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/defaults.yml b/config/defaults.yml
index 47c3ad7..383aa1c 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -7,11 +7,6 @@ cert_options: &cert_options
   client_cert_lifespan: 2
   client_cert_bit_size: 2024
   client_cert_hash: "SHA256"
-  allow_limited_certs: false
-  allow_unlimited_certs: true
-  allow_anonymous_certs: false
-  limited_cert_prefix: "LIMITED"
-  unlimited_cert_prefix: "UNLIMITED"
 
 downloads: &downloads
   client_download_domain: https://dl.bitmask.net
@@ -53,12 +48,17 @@ service_levels: &service_levels
       name: anonymous
       cert_prefix: "LIMITED"
       description: "anonymous account, with rate limited VPN"
+      services:
+        - eip
     1:
       name: free
       cert_prefix: "LIMITED"
       description: "free account, with rate limited VPN"
       cost: 0
       quota: 100
+      services:
+        - eip
+        - email
     2:
       name: premium
       cert_prefix: "UNLIMITED"
@@ -66,6 +66,9 @@ service_levels: &service_levels
       cost:
         USD: 10
         EUR: 10
+      services:
+        - eip
+        - email
   default_service_level: 1
   unauthenticated_service_level: 0
 
-- 
cgit v1.2.3