recompile demo

1 files changed, 57 insertions, 28 deletions

diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index d240647..6a55c6d 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -161,10 +161,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - wallaby.demo.bitmask.net
-    - demo.bitmask.net
     - api.demo.bitmask.net
+    - demo.bitmask.net
     - nicknym.demo.bitmask.net
+    - wallaby.demo.bitmask.net
   public: true
 domain: 
   full: wallaby.demo.bitmask.net
@@ -175,33 +175,40 @@ domain:
 enabled: true
 environment: demo
 haproxy: 
-  servers: 
-    ant: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
-    thrips: 
-      backup: false
-      host: localhost
-      port: 4001
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      ant: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
+      thrips: 
+        backup: false
+        host: localhost
+        port: 4001
+        weight: 100
+        writable: true
 hosts: 
   ant: 
     domain_full: ant.demo.bitmask.net
     domain_internal: ant.demo.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI="
     ip_address: "198.252.153.82"
+    port: 4422
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo="
     ip_address: "198.252.153.85"
+    port: 4422
   thrips: 
     domain_full: thrips.demo.bitmask.net
     domain_internal: thrips.demo.bitmask.i
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0="
     ip_address: "204.13.164.162"
+    port: 4422
 ip_address: "204.13.164.57"
 location: 
   country_code: US
@@ -219,6 +226,9 @@ nickserver:
     username: nickserver
   domain: nicknym.demo.bitmask.net
   port: 6425
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -259,29 +269,34 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  couch_client: 
-    ant_5984: 
-      accept_port: 4000
-      connect: ant.demo.bitmask.i
-      connect_port: 15984
-    thrips_5984: 
-      accept_port: 4001
-      connect: thrips.demo.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      ant_5984: 
+        accept_port: 4000
+        connect: ant.demo.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      thrips_5984: 
+        accept_port: 4001
+        connect: thrips.demo.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - demo
   - seattle
 webapp: 
   admins: 
+    - azul
     - elijah
-    - varac
-    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - azul
+    - micah
+    - varac
   allow_anonymous_certs: true
   allow_limited_certs: false
+  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -297,16 +312,29 @@ webapp:
     password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
     salt: c632af58769857bcdf108b46da9eaa44
     username: webapp
-  customization_dir: /etc/leap/files/webapp/
+  customization_dir: /srv/leap/files/webapp/
   default_service_level: 1
   domain: demo.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: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv
     username: nagios_test
@@ -741,3 +769,4 @@ x509:
       /76btyS2OfJe1Jcz43JX5/RD90q3Uo6Yi0j4NZwQb6TvFRyXnW5p2g==
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true