From 364a43d1ac65abd030baeddfc3eff763486cfe16 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 24 Nov 2014 16:11:17 -0500
Subject: update ssh host keys

---
 hiera/wallaby.yaml | 80 ++++++++++++++++++------------------------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

(limited to 'hiera/wallaby.yaml')

diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index e9a07e1..d240647 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -161,10 +161,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - api.demo.bitmask.net
+    - wallaby.demo.bitmask.net
     - demo.bitmask.net
+    - api.demo.bitmask.net
     - nicknym.demo.bitmask.net
-    - wallaby.demo.bitmask.net
   public: true
 domain: 
   full: wallaby.demo.bitmask.net
@@ -175,21 +175,17 @@ domain:
 enabled: true
 environment: demo
 haproxy: 
-  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
+  servers: 
+    ant: 
+      backup: false
+      host: localhost
+      port: 4000
+      weight: 100
+    thrips: 
+      backup: false
+      host: localhost
+      port: 4001
+      weight: 100
 hosts: 
   ant: 
     domain_full: ant.demo.bitmask.net
@@ -223,9 +219,6 @@ nickserver:
     username: nickserver
   domain: nicknym.demo.bitmask.net
   port: 6425
-platform: 
-  major_version: "0.6"
-  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -266,34 +259,29 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  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: {}
+  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
 tags: 
   - demo
   - seattle
 webapp: 
   admins: 
-    - azul
     - elijah
+    - varac
+    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - micah
-    - varac
+    - azul
   allow_anonymous_certs: true
   allow_limited_certs: false
-  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -309,29 +297,16 @@ webapp:
     password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg
     salt: c632af58769857bcdf108b46da9eaa44
     username: webapp
-  customization_dir: /srv/leap/files/webapp/
+  customization_dir: /etc/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
     source: "https://leap.se/git/leap_web"
   modules: 
+    - user
     - billing
     - help
-    - user
   nagios_test_user: 
     password: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv
     username: nagios_test
@@ -766,4 +741,3 @@ x509:
       /76btyS2OfJe1Jcz43JX5/RD90q3Uo6Yi0j4NZwQb6TvFRyXnW5p2g==
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true
-- 
cgit v1.2.3