From 85bdcb07c47e1c310241d31b3360f2b64723585d Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 13 Aug 2013 17:23:07 -0400
Subject: update couchdb submodule to the latest version - fixes #3447

Change-Id: Ib6458b962c624fdb75f514dbd4c2129581fc2bb7
---
 puppet/modules/couchdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
index 20deb065..f317163e 160000
--- a/puppet/modules/couchdb
+++ b/puppet/modules/couchdb
@@ -1 +1 @@
-Subproject commit 20deb0652ccfe105eddec6ba2ad32b8d633705f6
+Subproject commit f317163e8aa6abfc992df5ef65d99b0861488d41
-- 
cgit v1.2.3


From 9aa06a43fdc2a4eee50556e46b40d5003eb25925 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 13 Aug 2013 22:21:44 -0400
Subject: require that the couchdb::query::setup has been run before any
 attempts are made to create databases or add users as these would fail
 otherwise. Closes: #3466

Change-Id: Ifa8b3da5858ce858fd319c4a659e70d20a65d3e0
---
 .../modules/site_couchdb/manifests/bigcouch/add_nodes.pp |  5 ++++-
 puppet/modules/site_couchdb/manifests/init.pp            | 16 ++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
index 241a4914..97e85785 100644
--- a/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
+++ b/puppet/modules/site_couchdb/manifests/bigcouch/add_nodes.pp
@@ -1,5 +1,8 @@
 class site_couchdb::bigcouch::add_nodes {
   # loop through neighbors array and add nodes
   $nodes = $::site_couchdb::bigcouch_config['neighbors']
-  couchdb::bigcouch::add_node { $nodes: }
+
+  couchdb::bigcouch::add_node { $nodes:
+    require => Couchdb::Query::Setup['localhost']
+  }
 }
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 802f3224..75ed87a0 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -59,23 +59,27 @@ class site_couchdb {
 
   # Populate couchdb
   couchdb::add_user { $couchdb_webapp_user:
-    roles => '["auth"]',
-    pw    => $couchdb_webapp_pw,
-    salt  => $couchdb_webapp_salt
+    roles   => '["auth"]',
+    pw      => $couchdb_webapp_pw,
+    salt    => $couchdb_webapp_salt,
+    require => Couchdb::Query::Setup['localhost']
   }
 
   couchdb::add_user { $couchdb_soledad_user:
     roles => '["auth"]',
     pw    => $couchdb_soledad_pw,
-    salt  => $couchdb_soledad_salt
+    salt  => $couchdb_soledad_salt,
+    require => Couchdb::Query::Setup['localhost']
   }
 
   couchdb::create_db { 'users':
-    readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }"
+    readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
+    require => Couchdb::Query::Setup['localhost']
   }
 
   couchdb::create_db { 'tokens':
-    readers => "{ \"names\": [], \"roles\": [\"auth\"] }"
+    readers => "{ \"names\": [], \"roles\": [\"auth\"] }",
+    require => Couchdb::Query::Setup['localhost']
   }
 
   include site_shorewall::couchdb
-- 
cgit v1.2.3


From 5b52d1ed6e77416412a293be025580261284aa37 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 14 Aug 2013 10:09:46 -0400
Subject: Fix problem where webapp production.log had the wrong permissions -
 #3471

Change-Id: I20a6ecc43e36fc1e8416c46f7e4d14726995d2f2
---
 puppet/modules/site_webapp/manifests/couchdb.pp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index b4ef0980..ac01a5bc 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -39,7 +39,15 @@ class site_webapp::couchdb {
       mode    => '0600',
       require => Vcsrepo['/srv/leap/webapp'];
 
-    '/srv/leap/webapp/logs/production.log':
+    '/srv/leap/webapp/log':
+      ensure  => directory,
+      owner   => leap-webapp,
+      group   => leap-webapp,
+      mode    => '0755',
+      require => Vcsrepo['/srv/leap/webapp'];
+
+    '/srv/leap/webapp/log/production.log':
+      ensure  => present,
       owner   => leap-webapp,
       group   => leap-webapp,
       mode    => '0666',
-- 
cgit v1.2.3