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/canvasback.yaml | 58 +++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

(limited to 'hiera/canvasback.yaml')

diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index 1f8d46f..4980fcf 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -105,9 +105,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,15 +119,12 @@ domain:
 enabled: true
 environment: clientdev
 haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      gadwall: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
+  servers: 
+    gadwall: 
+      backup: false
+      host: localhost
+      port: 4000
+      weight: 100
 hosts: 
   chipmonk: 
     domain_full: chipmonk.cdev.bitmask.net
@@ -156,9 +153,6 @@ nickserver:
     username: nickserver
   domain: nicknym.cdev.bitmask.net
   port: 6425
-platform: 
-  major_version: "0.6"
-  version: "0.6"
 service_type: public_service
 services: 
   - webapp
@@ -199,29 +193,25 @@ ssh:
     ports: "60000:61000"
   port: 22
 stunnel: 
-  clients: 
-    couch_client: 
-      gadwall_5984: 
-        accept_port: 4000
-        connect: gadwall.cdev.bitmask.i
-        connect_port: 15984
-        original_port: 5984
-  servers: {}
+  couch_client: 
+    gadwall_5984: 
+      accept_port: 4000
+      connect: gadwall.cdev.bitmask.i
+      connect_port: 15984
 tags: 
   - clientdev
   - dc
 webapp: 
   admins: 
-    - azul
     - elijah
+    - varac
+    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - micah
-    - varac
+    - azul
   allow_anonymous_certs: false
   allow_limited_certs: false
-  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   client_certificates: 
@@ -237,29 +227,16 @@ webapp:
     password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
     salt: 1c1dd6eb78f027414f1638bd6c902a5a
     username: webapp
-  customization_dir: /srv/leap/files/webapp/
+  customization_dir: /etc/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
     source: "https://leap.se/git/leap_web"
   modules: 
+    - user
     - billing
     - help
-    - user
   nagios_test_user: 
     password: HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL
     username: nagios_test
@@ -572,4 +549,3 @@ x509:
       QJ+JGFsRME7FZQr9oetc7XefTczI1a0ENLiVTDeTgi4g2mqly3uSIg==
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true
-- 
cgit v1.2.3