From 40cd096ce2f683b5d8e6a6d51b7d8ebc152248d4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 2 Dec 2014 09:16:42 -0500
Subject: leap compile

---
 hiera/canvasback.yaml | 69 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 25 deletions(-)

(limited to 'hiera/canvasback.yaml')

diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index 4980fcf..2809bed 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -7,13 +7,6 @@ contacts:
 definition_files: 
   eip_service: |-
       {
-        "gateways": [
-      
-        ],
-        "locations": {
-      
-        },
-        "openvpn_configuration": null,
         "serial": 1,
         "version": 1
       }
@@ -105,9 +98,9 @@ development:
   site_config: true
 dns: 
   aliases: 
+    - api.cdev.bitmask.net
     - canvasback.cdev.bitmask.net
     - cdev.bitmask.net
-    - api.cdev.bitmask.net
     - nicknym.cdev.bitmask.net
   public: true
 domain: 
@@ -119,23 +112,28 @@ domain:
 enabled: true
 environment: clientdev
 haproxy: 
-  servers: 
-    gadwall: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      gadwall: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
 hosts: 
   chipmonk: 
     domain_full: chipmonk.cdev.bitmask.net
     domain_internal: chipmonk.cdev.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDyqIb8/kigC0IUCVFlIKmhp5+C/P2W7d71jMX6ZK9XAzRzxFdMmcvn5H6ypUsLWQ7r327nD1bRupKiYdmPWrWk="
     ip_address: "192.168.5.19"
+    port: 22
   gadwall: 
     domain_full: gadwall.cdev.bitmask.net
     domain_internal: gadwall.cdev.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog="
     ip_address: "192.168.5.5"
+    port: 22
 ip_address: "199.119.112.4"
 location: 
   country_code: US
@@ -153,6 +151,9 @@ nickserver:
     username: nickserver
   domain: nicknym.cdev.bitmask.net
   port: 6425
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -193,25 +194,29 @@ ssh:
     ports: "60000:61000"
   port: 22
 stunnel: 
-  couch_client: 
-    gadwall_5984: 
-      accept_port: 4000
-      connect: gadwall.cdev.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      gadwall_5984: 
+        accept_port: 4000
+        connect: gadwall.cdev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - clientdev
   - dc
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: false
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -227,16 +232,29 @@ webapp:
     password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
     salt: 1c1dd6eb78f027414f1638bd6c902a5a
     username: webapp
-  customization_dir: /etc/leap/files/webapp/
+  customization_dir: /srv/leap/files/webapp/
   default_service_level: 1
   domain: cdev.bitmask.net
+  engines: 
+    - support
+  forbidden_usernames: 
+    - admin
+    - administrator
+    - arin-admin
+    - certmaster
+    - contact
+    - info
+    - maildrop
+    - postmaster
+    - ssladmin
+    - www-data
   git: 
-    revision: origin/master
+    revision: origin/version/0.6
     source: "https://leap.se/git/leap_web"
   modules: 
-    - user
     - billing
     - help
+    - user
   nagios_test_user: 
     password: HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL
     username: nagios_test
@@ -549,3 +567,4 @@ x509:
       QJ+JGFsRME7FZQr9oetc7XefTczI1a0ENLiVTDeTgi4g2mqly3uSIg==
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true
-- 
cgit v1.2.3