From 77528b228c6d7ba095a796df4c5cc4c95eb50d9d Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Nov 2013 14:00:10 -0500 Subject: pretty reformat couchdb.json and site_couchdb/manifests/init.pp, alphabetizing couchdb users Change-Id: I88264d32e9381f826652d1631083ba371e2b1b54 --- provider_base/services/couchdb.json | 68 ++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index a26579c8..95ab75f1 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -1,38 +1,38 @@ { - "x509": { - "use": true - }, - "stunnel": { - "couch_server": "= stunnel_server(couch.port)", - "epmd_server": "= stunnel_server(couch.bigcouch.epmd_port)", - "epmd_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.epmd_port)", - "ednp_server": "= stunnel_server(couch.bigcouch.ednp_port)", - "ednp_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.ednp_port)" - }, - "couch": { - "port": 5984, - "bigcouch": { - "epmd_port": 4369, - "ednp_port": 9002, - "cookie": "= secret :bigcouch_cookie", - "neighbors": "= nodes_like_me[:services => :couchdb].exclude(self).field('domain.full')" + "x509": { + "use": true }, - "users": { - "admin": { - "username": "admin", - "password": "= secret :couch_admin_password", - "salt": "= hex_secret :couch_admin_password_salt, 128" - }, - "webapp": { - "username": "webapp", - "password": "= secret :couch_webapp_password", - "salt": "= hex_secret :couch_webapp_password_salt, 128" - }, - "soledad": { - "username": "soledad", - "password": "= secret :couch_soledad_password", - "salt": "= hex_secret :couch_soledad_password_salt, 128" - } + "stunnel": { + "couch_server": "= stunnel_server(couch.port)", + "epmd_server": "= stunnel_server(couch.bigcouch.epmd_port)", + "epmd_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.epmd_port)", + "ednp_server": "= stunnel_server(couch.bigcouch.ednp_port)", + "ednp_clients": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.bigcouch.ednp_port)" + }, + "couch": { + "port": 5984, + "bigcouch": { + "epmd_port": 4369, + "ednp_port": 9002, + "cookie": "= secret :bigcouch_cookie", + "neighbors": "= nodes_like_me[:services => :couchdb].exclude(self).field('domain.full')" + }, + "users": { + "admin": { + "username": "admin", + "password": "= secret :couch_admin_password", + "salt": "= hex_secret :couch_admin_password_salt, 128" + }, + "soledad": { + "username": "soledad", + "password": "= secret :couch_soledad_password", + "salt": "= hex_secret :couch_soledad_password_salt, 128" + }, + "webapp": { + "username": "webapp", + "password": "= secret :couch_webapp_password", + "salt": "= hex_secret :couch_webapp_password_salt, 128" + } + } } - } } -- cgit v1.2.3 From fdf028e53cb1efa9d3d6c8ab76c89f98e2fb7498 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Nov 2013 14:03:03 -0500 Subject: add leap_mx couchdb user/password Change-Id: Ice83115e0feabddd40ad74c2a6e98e24da9b4c2f --- provider_base/services/couchdb.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 95ab75f1..61b97da1 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -23,6 +23,11 @@ "password": "= secret :couch_admin_password", "salt": "= hex_secret :couch_admin_password_salt, 128" }, + "leap_mx": { + "username": "leap_mx", + "password": "= secret :couch_leap_mx_password", + "salt": "= hex_secret :couch_leap_mx_password_salt, 128" + }, "soledad": { "username": "soledad", "password": "= secret :couch_soledad_password", -- cgit v1.2.3 From 6bff399fdcdab967a13a27d40dcef4bfb871e046 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Nov 2013 14:12:28 -0500 Subject: add nickserver couchdb user, set it to have 'identities' role Change-Id: I06723ccf2ba040204e9fc5256c99a1faad6abb5f --- provider_base/services/couchdb.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 61b97da1..1a8147f9 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -28,6 +28,11 @@ "password": "= secret :couch_leap_mx_password", "salt": "= hex_secret :couch_leap_mx_password_salt, 128" }, + "nickserver": { + "username": "nickserver", + "password": "= secret :couch_nickserver_password", + "salt": "= hex_secret :couch_nickserver_password_salt, 128" + }, "soledad": { "username": "soledad", "password": "= secret :couch_soledad_password", -- cgit v1.2.3 From 0aed6d16a0303e05462f4c81cda0ced9872773bf Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Nov 2013 14:27:50 -0500 Subject: add the tapicero couchdb user, and appropriate roles Change-Id: I41e9a73c8d04d5a2d74b41c8e32aca9906f3a4cf --- provider_base/services/couchdb.json | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 1a8147f9..0cb044ef 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -38,6 +38,11 @@ "password": "= secret :couch_soledad_password", "salt": "= hex_secret :couch_soledad_password_salt, 128" }, + "tapicero": { + "username": "tapicero", + "password": "= secret :couch_tapicero_password", + "salt": "= hex_secret :couch_tapicero_password_salt, 128" + }, "webapp": { "username": "webapp", "password": "= secret :couch_webapp_password", -- cgit v1.2.3 From 8882880d5959f14a7edb94ca95ebcdd15cbc3f51 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 27 Feb 2014 13:27:00 +0100 Subject: provide nagios_test_pw in hiera files --- provider_base/services/couchdb.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'provider_base/services/couchdb.json') diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json index 0cb044ef..5f1b5381 100644 --- a/provider_base/services/couchdb.json +++ b/provider_base/services/couchdb.json @@ -48,6 +48,9 @@ "password": "= secret :couch_webapp_password", "salt": "= hex_secret :couch_webapp_password_salt, 128" } + }, + "webapp": { + "nagios_test_pw": "= secret :nagios_test_password" } } } -- cgit v1.2.3