From fbdd990ff399d26a11e0dce096e15ef2d8cde521 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 13 Jul 2015 22:09:01 +0200
Subject: [PATCH 1/1] run git checkout before the rest of the nominatim setup

---
 cookbooks/nominatim/recipes/base.rb   |  1 -
 cookbooks/nominatim/recipes/master.rb | 19 +++++++++++--------
 cookbooks/nominatim/recipes/slave.rb  |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 88b9cf6fa..390de61f9 100644
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apache::ssl"
 include_recipe "postgresql"
-include_recipe "git"
 
 package "php5"
 package "php5-cli"
diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index 2e0094152..d33d7658d 100644
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -17,6 +17,17 @@
 # limitations under the License.
 #
 
+include_recipe "git"
+
+git "#{home_directory}/nominatim" do
+  action :checkout
+  repository node[:nominatim][:repository]
+  enable_submodules true
+  user "nominatim"
+  group "nominatim"
+  notifies :run, "execute[compile_nominatim]"
+end
+
 include_recipe "nominatim::base"
 
 passwords = data_bag_item("nominatim", "passwords")
@@ -42,11 +53,3 @@ postgresql_user "replication" do
   replication true
 end
 
-git "#{home_directory}/nominatim" do
-  action :checkout
-  repository node[:nominatim][:repository]
-  enable_submodules true
-  user "nominatim"
-  group "nominatim"
-  notifies :run, "execute[compile_nominatim]"
-end
diff --git a/cookbooks/nominatim/recipes/slave.rb b/cookbooks/nominatim/recipes/slave.rb
index d7c7889c8..6c263caf5 100644
--- a/cookbooks/nominatim/recipes/slave.rb
+++ b/cookbooks/nominatim/recipes/slave.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "nominatim::base"
+include_recipe "git"
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 
@@ -28,3 +28,5 @@ git "#{home_directory}/nominatim" do
   group "nominatim"
   notifies :run, "execute[compile_nominatim]"
 end
+
+include_recipe "nominatim::base"
-- 
2.43.2