summaryrefslogtreecommitdiff
path: root/hiera/couch1.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'hiera/couch1.yaml')
-rw-r--r--hiera/couch1.yaml55
1 files changed, 19 insertions, 36 deletions
diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index f0de356..0aef52d 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -8,8 +8,6 @@ couch:
epmd_port: 4369
neighbors:
- couch2.bitmask.net
- master: false
- mode: multimaster
port: 5984
users:
admin:
@@ -24,10 +22,6 @@ couch:
password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR
salt: 73567fc12c27a79152620084e97b4fba
username: nickserver
- replication:
- password: fbZMru8SZ9UhaHXYRW2f9RVCjJmBwBuJ
- salt: b2716ac90f4e9dd7b2a088d2765ae374
- username: replication
soledad:
password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp
salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7
@@ -73,9 +67,6 @@ mail:
smarthost:
- mx1.bitmask.net
name: couch1
-platform:
- major_version: "0.6"
- version: "0.6"
service_type: public_service
services:
- couchdb
@@ -125,29 +116,25 @@ ssh:
ports: "60000:61000"
port: 22
stunnel:
- clients:
- ednp_clients:
- couch2_9002:
- accept_port: 4001
- connect: couch2.bitmask.i
- connect_port: 19002
- original_port: 9002
- epmd_clients:
- couch2_4369:
- accept_port: 4000
- connect: couch2.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:
+ couch2_9002:
+ accept_port: 4001
+ connect: couch2.bitmask.i
+ connect_port: 19002
+ ednp_server:
+ accept: 19002
+ connect: "127.0.0.1:9002"
+ epmd_clients:
+ couch2_4369:
+ accept_port: 4000
+ connect: couch2.bitmask.i
+ connect_port: 14369
+ epmd_server:
+ accept: 14369
+ connect: "127.0.0.1:4369"
tags:
- local
x509:
@@ -212,9 +199,6 @@ x509:
7AQ/LsmCL5K6F5OqPAUMwc7w1Jp2CSq0sqBSuyjq5Xaom2eQcRD02c1pcLfJwWRS
iEbJwlSbPVGpScfRfoaOlyiH96btwnWvaIBgf3Ii7dLTSc2EIO5s
-----END CERTIFICATE-----
- commercial_ca_cert: ~
- commercial_cert: ~
- commercial_key: ~
key: |
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAzGNOpJbUz6hQrWmBUgfJPzYfVZhDeEJAalXuuXxlVU1wlsSG
@@ -244,4 +228,3 @@ x509:
SeSdWAYGKZZAMSQInihge20dMu1TgS7R0ijeAf4LaoMEq3AOkXMf
-----END RSA PRIVATE KEY-----
use: true
- use_commercial: false