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/vpn1.yaml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'hiera/vpn1.yaml')

diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index 5825a5c..b3005e7 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -13,13 +13,18 @@ domain:
   name: vpn1.bitmask.net
 enabled: true
 environment: local
-hosts: ~
+hosts: {}
 ip_address: "10.5.5.45"
 location: ~
 mail: 
   smarthost: 
     - mx1.bitmask.net
 name: vpn1
+obfsproxy: 
+  gateway_address: "10.5.5.46"
+  scramblesuit: 
+    password: K5HEYZTLIVIDIUDZKF2EE2BZKNTGCSSF
+    port: 22735
 openvpn: 
   adblock: false
   allow_free: true
@@ -44,6 +49,9 @@ openvpn:
   second_gateway_address: ~
   unlimited_prefix: UNLIMITED
   user_ips: false
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: user_service
 services: 
   - openvpn
@@ -84,6 +92,9 @@ ssh:
     enabled: true
     ports: "60000:61000"
   port: 22
+stunnel: 
+  clients: {}
+  servers: {}
 tags: 
   - local
 x509: 
@@ -182,6 +193,9 @@ x509:
       xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF
       gkVBxxt/s0R2aKM=
       -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   dh: |
       -----BEGIN DH PARAMETERS-----
       MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
@@ -223,3 +237,4 @@ x509:
       8hacajGZ/d17cG5lIC269f9SeCqCBkg4IjJJA8aPX65M4J1UdF+h
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: false
-- 
cgit v1.2.3