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/thrips.yaml | 55 +++++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

(limited to 'hiera/thrips.yaml')

diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index ca86ee5..6d916bc 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -9,8 +9,6 @@ couch:
     epmd_port: 4369
     neighbors: 
       - ant.demo.bitmask.net
-  master: false
-  mode: multimaster
   port: 5984
   users: 
     admin: 
@@ -25,10 +23,6 @@ couch:
       password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G
       salt: e3ee9259723d0cbd8b3265dbe8b4e21e
       username: nickserver
-    replication: 
-      password: gPFMMKdZaTHF24nQGYQTDHkAduQcarBm
-      salt: 215a1f508e2b564978f98e43231e1506
-      username: replication
     soledad: 
       password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
       salt: 514355e86f1d3fa4de42b677de21281d
@@ -81,9 +75,6 @@ mail:
   smarthost: 
     - leech.demo.bitmask.net
 name: thrips
-platform: 
-  major_version: "0.6"
-  version: "0.6"
 service_type: public_service
 services: 
   - couchdb
@@ -132,29 +123,25 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  clients: 
-    ednp_clients: 
-      ant_9002: 
-        accept_port: 4001
-        connect: ant.demo.bitmask.i
-        connect_port: 19002
-        original_port: 9002
-    epmd_clients: 
-      ant_4369: 
-        accept_port: 4000
-        connect: ant.demo.bitmask.i
-        connect_port: 14369
-        original_port: 4369
-  servers: 
-    couch_server: 
-      accept_port: 15984
-      connect_port: 5984
-    ednp_server: 
-      accept_port: 19002
-      connect_port: 9002
-    epmd_server: 
-      accept_port: 14369
-      connect_port: 4369
+  couch_server: 
+    accept: 15984
+    connect: "127.0.0.1:5984"
+  ednp_clients: 
+    ant_9002: 
+      accept_port: 4001
+      connect: ant.demo.bitmask.i
+      connect_port: 19002
+  ednp_server: 
+    accept: 19002
+    connect: "127.0.0.1:9002"
+  epmd_clients: 
+    ant_4369: 
+      accept_port: 4000
+      connect: ant.demo.bitmask.i
+      connect_port: 14369
+  epmd_server: 
+    accept: 14369
+    connect: "127.0.0.1:4369"
 tags: 
   - demo
   - seattle
@@ -221,9 +208,6 @@ x509:
       bbeVsHat97eo2210j/wOQUxoGYzUq4WVKoCbQFfAhf/ksXhNn6mBBCuhCDp/Mu09
       s0n2njL9
       -----END CERTIFICATE-----
-  commercial_ca_cert: ~
-  commercial_cert: ~
-  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEogIBAAKCAQEA9TdRRiX7Ia4yRKvGpRuV7Ff/iS29eFdddwSYg+uPSRm4Hn4f
@@ -253,4 +237,3 @@ x509:
       GaBuHcOkEMwibPgxyoBZLPlS4/Au7MZLRTRqGoo8N1vl0x71mhA=
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: false
-- 
cgit v1.2.3