From 5a772e8e7a403521f306724c4ed6b2cab1315c21 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 2 Oct 2014 09:09:14 -0700
Subject: recompile unstable.

---
 hiera/chameleon.yaml | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'hiera/chameleon.yaml')

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index e41f788..e10047b 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -71,7 +71,7 @@ definition_files:
           "en": "Bitmask"
         },
         "service": {
-          "allow_anonymous": true,
+          "allow_anonymous": false,
           "allow_free": true,
           "allow_limited_bandwidth": false,
           "allow_paid": false,
@@ -151,12 +151,15 @@ domain:
 enabled: true
 environment: unstable
 haproxy: 
-  servers: 
-    panda: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      panda: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
 hosts: 
   ant: 
     domain_full: ant.demo.bitmask.net
@@ -516,11 +519,14 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_client: 
-    panda_5984: 
-      accept_port: 4000
-      connect: panda.unstable.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      panda_5984: 
+        accept_port: 4000
+        connect: panda.unstable.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - unstable
   - dc
@@ -534,8 +540,9 @@ webapp:
     - mcnair
     - meanderingcode
     - azul
-  allow_anonymous_certs: true
+  allow_anonymous_certs: false
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   billing: 
@@ -563,7 +570,7 @@ webapp:
   engines: 
     - support
   git: 
-    revision: origin/master
+    revision: origin/develop
     source: "https://leap.se/git/leap_web"
   modules: 
     - user
@@ -886,3 +893,4 @@ x509:
       zj1phDvC1SxOKRGtM39+B8poUvsLais3X7FE33bjEaBScVcIc9U=
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true
-- 
cgit v1.2.3