diff options
author | Micah Anderson <micah@riseup.net> | 2014-10-30 16:42:35 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2014-10-30 16:52:18 -0400 |
commit | 910613898c53a42da9e8777b5d1e19ee8de81634 (patch) | |
tree | 4100a70989152f6a4f3287947c1f53f6a33f215f /hiera/couch2.yaml | |
parent | 49b0ae0d37fddc0dc9d32371160376329af1a1b7 (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/couch2.yaml')
-rw-r--r-- | hiera/couch2.yaml | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml index 5b84310..c08b592 100644 --- a/hiera/couch2.yaml +++ b/hiera/couch2.yaml @@ -8,6 +8,8 @@ couch: epmd_port: 4369 neighbors: - couch1.bitmask.net + master: false + mode: multimaster port: 5984 users: admin: @@ -22,6 +24,10 @@ couch: password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR salt: 73567fc12c27a79152620084e97b4fba username: nickserver + replication: + password: fbZMru8SZ9UhaHXYRW2f9RVCjJmBwBuJ + salt: b2716ac90f4e9dd7b2a088d2765ae374 + username: replication soledad: password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7 @@ -67,6 +73,9 @@ mail: smarthost: - mx1.bitmask.net name: couch2 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -116,25 +125,29 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: - couch1_9002: - accept_port: 4001 - connect: couch1.bitmask.i - connect_port: 19002 - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: - couch1_4369: - accept_port: 4000 - connect: couch1.bitmask.i - connect_port: 14369 - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: + couch1_9002: + accept_port: 4001 + connect: couch1.bitmask.i + connect_port: 19002 + original_port: 9002 + epmd_clients: + couch1_4369: + accept_port: 4000 + connect: couch1.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: - local x509: @@ -199,6 +212,9 @@ x509: zXhBGqCxzoUZSCaxmCIeRBe18GoWRM0JZnpBbi4K3r3ZOIjzoEUK3L6e0tRkJCNc GXE33HbYQAtwidqDCHrb0LLWJjLeI/10avzPtGr/rqVKYufTRq1b -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAse0pV7xCoGB/dvqmIlc8nY+9/TaKtp/2qfCWAE4fa49vP3NU @@ -228,3 +244,4 @@ x509: balQCbIbD77nO3413Tdg3G0mj6826wrJI4j0jvHk1HU53C7bkaL1dxo= -----END RSA PRIVATE KEY----- use: true + use_commercial: false |