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/tor1.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'hiera/tor1.yaml')

diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index 0a57d79..4b0a98c 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -13,13 +13,16 @@ domain:
   name: tor1.bitmask.i
 enabled: true
 environment: local
-hosts: ~
+hosts: {}
 ip_address: "10.5.5.50"
 location: ~
 mail: 
   smarthost: 
     - mx1.bitmask.net
 name: tor1
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: internal_service
 services: 
   - tor
@@ -60,13 +63,16 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - local
 tor: 
   bandwidth_rate: 6550
   contacts: 
     - sysdev@leap.se
-  family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG"
+  family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT"
   nickname: tor1pPXtPbHH5BVHVE2
 x509: 
   ca_cert: |
@@ -130,6 +136,9 @@ x509:
       KyFwoPZJ/prUbN7soJcaXfMRwKjKBtAZcfiEIuF/Kj0q0ej3SlIRQn9qQ3kB8gCm
       rq5L0rF43W9j+Nk6UsuShrFnpNco1oeVupR64lMe/NeS
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEpQIBAAKCAQEA22A15S8yonSXCU8U/5UHkTMMgsWpnEwk28+xGzwbRCX5g4dF
@@ -159,3 +168,4 @@ x509:
       FPbeaUQIPPQfHUADhENClQ9eGyeOEj4BUwGbGxyKVBQEeJUO0VsD4eM=
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
-- 
cgit v1.2.3