From 910613898c53a42da9e8777b5d1e19ee8de81634 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 Oct 2014 16:42:35 -0400 Subject: update host keys for reset dev servers; add new secrets for couch replication and scramblesuit, and other hiera options that were updated --- hiera/gadwall.yaml | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) (limited to 'hiera/gadwall.yaml') diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml index 096acff..9c8ad77 100644 --- a/hiera/gadwall.yaml +++ b/hiera/gadwall.yaml @@ -7,6 +7,8 @@ couch: ednp_port: 9002 epmd_port: 4369 neighbors: [] + master: false + mode: multimaster port: 5984 users: admin: @@ -21,6 +23,10 @@ couch: password: vjJAZqxPL4BeGKAEUVuBVK5MIba_aIY5 salt: eab38a050b5eb2569549f8e50cab9034 username: nickserver + replication: + password: gxbjRLwwDW5bQQx9MpbjNaqF_KdMbCng + salt: 751525d259cb7ec8e536b7caa21bb23c + username: replication soledad: password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De salt: ac15331e0c098126e04ecf7a21045079 @@ -68,6 +74,9 @@ mail: smarthost: - chipmonk.cdev.bitmask.net name: gadwall +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -116,17 +125,19 @@ ssh: ports: "60000:61000" port: 22 stunnel: - 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" + 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 tags: - clientdev - dc @@ -193,6 +204,9 @@ x509: jAR3FCr8Vvm4UoDbxvF4jeg+6Bd1D1Pz5lsMd5q/LHSk8nuTB+y2B6x96Q9/VkNc 14teuyf5AarZxA== -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEA0Jt1sr/RTOJ8ue70yqv2qLeo4mAVPaZsGgtkh6l5eMrTGCOH @@ -222,3 +236,4 @@ x509: C917/dIQt48xJFBcX1oRHcFoakIVB4+h41Bc8mS09cR29Og8+JPP -----END RSA PRIVATE KEY----- use: true + use_commercial: false -- cgit v1.2.3