From 22fe74edaecbf8e9c76e74e7e74ce8a1cb8a629a Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 27 Feb 2014 09:04:53 -0800
Subject: fixed horrible bug that caused all environments to use the same
 couchdb soledad password.

---
 provider_base/services/soledad.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json
index fc349ce1..ed6fbc9f 100644
--- a/provider_base/services/soledad.json
+++ b/provider_base/services/soledad.json
@@ -2,7 +2,11 @@
   "soledad": {
     "port": 2323,
     "require_couchdb": "=> assert %(services.include? 'couchdb')",
-    "couchdb_soledad_user": "= global.services[:couchdb].couch.users[:soledad]"
+    "couchdb_soledad_user": {
+      "username": "= global.services[:couchdb].couch.users[:soledad].username",
+      "password": "= secret :couch_soledad_password",
+      "salt": "= hex_secret :couch_soledad_password_salt, 128"
+    }
   },
   "service_type": "public_service"
 }
-- 
cgit v1.2.3


From d2b3a5827bfec4e505484e84ece024a768d20cfa Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 27 Feb 2014 11:57:54 -0800
Subject: fixed more places where passwords were set to the wrong environment.

---
 provider_base/services/mx.json     |  6 +++++-
 provider_base/services/webapp.json | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index d57c3168..7e3f20ba 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -5,7 +5,11 @@
   "haproxy": {
     "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)"
   },
-  "couchdb_leap_mx_user": "= global.services[:couchdb].couch.users[:leap_mx]",
+  "couchdb_leap_mx_user": {
+    "username": "= global.services[:couchdb].couch.users[:leap_mx].username",
+    "password": "= secret :couch_leap_mx_password",
+    "salt": "= hex_secret :couch_leap_mx_password_salt, 128"
+  },
   "mx_nodes": "= nodes['services' => 'mx']['environment' => '!local'].field('ip_address')",
   "x509": {
     "use": true,
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 08c7c5b0..8974f851 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,11 @@
   "webapp": {
     "admins": [],
     "modules": ["user", "billing", "help"],
-    "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+    "couchdb_webapp_user": {
+      "username": "= global.services[:couchdb].couch.users[:webapp].username",
+      "password": "= secret :couch_webapp_password",
+      "salt": "= hex_secret :couch_webapp_password_salt, 128"
+    },
     "customization_dir": "= file_path 'webapp'",
     "client_certificates": "= global.provider.ca.client_certificates",
     "allow_limited_certs": "= global.provider.service.allow_limited_bandwidth",
@@ -36,7 +40,11 @@
   },
   "nickserver": {
     "domain": "= 'nicknym.' + domain.full_suffix",
-    "couchdb_nickserver_user": "= global.services[:couchdb].couch.users[:nickserver]",
+    "couchdb_nickserver_user": {
+      "username": "= global.services[:couchdb].couch.users[:nickserver].username",
+      "password": "= secret :couch_nickserver_password",
+      "salt": "= hex_secret :couch_nickserver_password_salt, 128"
+    },
     "port": 6425
   },
   "dns": {
-- 
cgit v1.2.3


From a9f757f169611ce9ab65a6e0053e88fd744bfb7b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 5 Mar 2014 16:27:54 +0100
Subject: updated submodule rubygems (#3827)

---
 puppet/modules/rubygems | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/puppet/modules/rubygems b/puppet/modules/rubygems
index 1e5ed3db..ef820cfe 160000
--- a/puppet/modules/rubygems
+++ b/puppet/modules/rubygems
@@ -1 +1 @@
-Subproject commit 1e5ed3dbef9381bb9d5e2a7b4957bb3f5288d6a8
+Subproject commit ef820cfec3321d17be99ef814318adb4e3cc1e91
-- 
cgit v1.2.3