From 2da1ce611e28e4831c72e258c7b47eb1586f9d76 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 20 May 2014 15:31:37 -0700
Subject: a fresh recompile

---
 hiera/chameleon.yaml | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'hiera/chameleon.yaml')

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 21e5dcd..46b5d3f 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -42,7 +42,8 @@ definition_files:
           "auth": "SHA1",
           "cipher": "AES-128-CBC",
           "keepalive": "10 30",
-          "tls-cipher": "DHE-RSA-AES128-SHA"
+          "tls-cipher": "DHE-RSA-AES128-SHA",
+          "tun-ipv6": true
         },
         "serial": 1,
         "version": 1
@@ -73,36 +74,17 @@ definition_files:
           "allow_anonymous": true,
           "allow_free": true,
           "allow_limited_bandwidth": false,
-          "allow_paid": true,
+          "allow_paid": false,
           "allow_registration": true,
           "allow_unlimited_bandwidth": true,
           "bandwidth_limit": 102400,
           "default_service_level": 1,
-          "levels": [
-            {
-              "id": 1,
-              "name": "free",
-              "storage": 50
-            },
-            {
-              "id": 2,
-              "name": "basic",
-              "rate": [
-                "US$10",
-                "€10"
-              ],
-              "storage": 1000
-            },
-            {
-              "id": 3,
-              "name": "pro",
-              "rate": [
-                "US$20",
-                "€20"
-              ],
-              "storage": 10000
+          "levels": {
+            "1": {
+              "description": "Please donate.",
+              "name": "free"
             }
-          ]
+          }
         },
         "services": [
           "mx",
@@ -155,8 +137,8 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - unstable.bitmask.net
     - chameleon.unstable.bitmask.net
+    - unstable.bitmask.net
     - api.unstable.bitmask.net
     - nicknym.unstable.bitmask.net
   public: true
@@ -577,6 +559,8 @@ webapp:
     salt: 478bf7e8ca879a9711b279055f00153e
     username: webapp
   customization_dir: /etc/leap/files/webapp/
+  default_service_level: 1
+  domain: unstable.bitmask.net
   git: 
     revision: origin/develop
     source: "https://leap.se/git/leap_web"
@@ -589,6 +573,11 @@ webapp:
     username: nagios_test
   secret_token: aC9zAs6X5YE_9EC_RQckGCFkKfJ4vTAJ
   secure: false
+  service_levels: 
+    ? "1"
+    : 
+      description: "Please donate."
+      name: free
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
-- 
cgit v1.2.3