summaryrefslogtreecommitdiff
path: root/hiera/thrips.yaml
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2014-10-30 16:42:35 -0400
committerMicah Anderson <micah@riseup.net>2014-10-30 16:52:18 -0400
commit910613898c53a42da9e8777b5d1e19ee8de81634 (patch)
tree4100a70989152f6a4f3287947c1f53f6a33f215f /hiera/thrips.yaml
parent49b0ae0d37fddc0dc9d32371160376329af1a1b7 (diff)
update host keys for reset dev servers; add new secrets for couch replication and scramblesuit, and other hiera options that were updated
Diffstat (limited to 'hiera/thrips.yaml')
-rw-r--r--hiera/thrips.yaml55
1 files changed, 36 insertions, 19 deletions
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index 6d916bc..ca86ee5 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -9,6 +9,8 @@ couch:
epmd_port: 4369
neighbors:
- ant.demo.bitmask.net
+ master: false
+ mode: multimaster
port: 5984
users:
admin:
@@ -23,6 +25,10 @@ couch:
password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G
salt: e3ee9259723d0cbd8b3265dbe8b4e21e
username: nickserver
+ replication:
+ password: gPFMMKdZaTHF24nQGYQTDHkAduQcarBm
+ salt: 215a1f508e2b564978f98e43231e1506
+ username: replication
soledad:
password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
salt: 514355e86f1d3fa4de42b677de21281d
@@ -75,6 +81,9 @@ mail:
smarthost:
- leech.demo.bitmask.net
name: thrips
+platform:
+ major_version: "0.6"
+ version: "0.6"
service_type: public_service
services:
- couchdb
@@ -123,25 +132,29 @@ ssh:
ports: "60000:61000"
port: 4422
stunnel:
- 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"
+ 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
tags:
- demo
- seattle
@@ -208,6 +221,9 @@ x509:
bbeVsHat97eo2210j/wOQUxoGYzUq4WVKoCbQFfAhf/ksXhNn6mBBCuhCDp/Mu09
s0n2njL9
-----END CERTIFICATE-----
+ commercial_ca_cert: ~
+ commercial_cert: ~
+ commercial_key: ~
key: |
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEA9TdRRiX7Ia4yRKvGpRuV7Ff/iS29eFdddwSYg+uPSRm4Hn4f
@@ -237,3 +253,4 @@ x509:
GaBuHcOkEMwibPgxyoBZLPlS4/Au7MZLRTRqGoo8N1vl0x71mhA=
-----END RSA PRIVATE KEY-----
use: true
+ use_commercial: false