From 910613898c53a42da9e8777b5d1e19ee8de81634 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 30 Oct 2014 16:42:35 -0400
Subject: update host keys for reset dev servers; add new secrets for couch
 replication and scramblesuit, and other hiera options that were updated

---
 hiera/plain1.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'hiera/plain1.yaml')

diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml
index f9dd40f..0803790 100644
--- a/hiera/plain1.yaml
+++ b/hiera/plain1.yaml
@@ -13,13 +13,16 @@ domain:
   name: plain1.bitmask.i
 enabled: true
 environment: local
-hosts: ~
+hosts: {}
 ip_address: "10.5.5.53"
 location: ~
 mail: 
   smarthost: 
     - mx1.bitmask.net
 name: plain1
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: internal_service
 services: []
 squid_deb_proxy_client: true
@@ -59,6 +62,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - local
 x509: 
@@ -123,6 +129,9 @@ x509:
       eETeBOj/+0v63CmHRfJ6Z98xO/MJSZFFjGS2//qTIK5xzgv/KGsCc6kAG1hraxQD
       Kr4RCrkqLyEJCJE59qGTrFnOgSL5Eg/RoCH/VEWLi/ExnlcAjaOlqA==
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEowIBAAKCAQEA1ziNA/5axlzBHy237cP9U1Fw9flwUp1cxQ5e5lfYHY3qKAvZ
@@ -152,3 +161,4 @@ x509:
       HOV/+qIAtUvR2IkgKg1W26N61zzagmn0aBP+c7EBxEtSOh2+2VHm
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
-- 
cgit v1.2.3