run git checkout before the rest of the nominatim setup

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 88b9cf6fa49e3c85749c12575570525703c1d5f8..390de61f93ed3653b6a7b1441156a182e4642aa8 100644 (file)
--- 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 "apache::ssl"
 include_recipe "postgresql"

-include_recipe "git"

 
 package "php5"
 package "php5-cli"
 
 package "php5"
 package "php5-cli"

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index 2e0094152c7cfa865420703e3856868f2402b519..d33d7658d6c860facd0611b4ad921c35f28a0fe8 100644 (file)
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -17,6 +17,17 @@
 # limitations under the License.
 #
 
 # 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")
 include_recipe "nominatim::base"
 
 passwords = data_bag_item("nominatim", "passwords")


@@ -42,11 +53,3 @@ postgresql_user "replication" do
   replication true
 end
 
   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 d7c7889c8cb240f7dddcd50b3878f4b906f951bd..6c263caf59e1f3f772844c27a12e560bd8979f66 100644 (file)
--- a/cookbooks/nominatim/recipes/slave.rb
+++ b/cookbooks/nominatim/recipes/slave.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "nominatim::base"
+include_recipe "git"

 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 
 
 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
   group "nominatim"
   notifies :run, "execute[compile_nominatim]"
 end

+
+include_recipe "nominatim::base"