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/panda.yaml | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

(limited to 'hiera/panda.yaml')

diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index ac92386..d7a4509 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -7,8 +7,6 @@ couch:
     ednp_port: 9002
     epmd_port: 4369
     neighbors: []
-  master: false
-  mode: multimaster
   port: 5984
   users: 
     admin: 
@@ -23,10 +21,6 @@ couch:
       password: PzzQwxCvQLZUxRdS2jshMPN37Ps4qtbH
       salt: b54d7b0f595d7318d961c636fb8f5530
       username: nickserver
-    replication: 
-      password: LZg8s_Z6FCg2MZRQYjkYeE6arCIU2pCw
-      salt: b004ef682f926531fdda36e26d48c4fa
-      username: replication
     soledad: 
       password: 35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf
       salt: 7f725f3cc60c388e9af8140555e09dfa
@@ -74,9 +68,6 @@ mail:
   smarthost: 
     - octopus.unstable.bitmask.net
 name: panda
-platform: 
-  major_version: "0.6"
-  version: "0.6"
 service_type: public_service
 services: 
   - couchdb
@@ -125,22 +116,20 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  clients: 
-    ednp_clients: {}
-    epmd_clients: {}
-  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: {}
+  ednp_server: 
+    accept: 19002
+    connect: "127.0.0.1:9002"
+  epmd_clients: {}
+  epmd_server: 
+    accept: 14369
+    connect: "127.0.0.1:4369"
 tags: 
-  - dc
   - unstable
+  - dc
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -204,9 +193,6 @@ x509:
       on5r5VCjv69sw/yJCqGWUaDfPb8ui+kv+JfIsQ8BoXSaSA81OZ5HeQ11vo5Hh7TZ
       jUjUzNF+926ph4U2SgvNjQ==
       -----END CERTIFICATE-----
-  commercial_ca_cert: ~
-  commercial_cert: ~
-  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIEpAIBAAKCAQEA0iB5rq3smyrvJRHApK3NapMbIZFzWfVIReFjqSt1jX6ZGWsM
@@ -236,4 +222,3 @@ x509:
       gXDYMT8LiHhMP5GD5vauBqcJwmH6kiGpqoWWirotjVaXbLcCBnyIDw==
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: false
-- 
cgit v1.2.3