imagery: add MVP git site support

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 85816c3f4f9726e11376e3ae08adba3a579164df..f2fe09bcc7619e5ffc0c781512f074e0dce889ac 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -21,6 +21,7 @@ include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
   # aliases [ "agri.openstreetmap.org.au" ]
+  git_repository "https://github.com/Firefishy/osm-imagery-agri-site.git"
 end
 
 imagery_layer "au_ga_agri" do

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index a53ad56bb21d78986efb6a5510ccc626ba64f67a..d6734a4202cdac5aeaaf0ceca842a60015ed8cd4 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -21,6 +21,7 @@ include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
   # aliases
+  git_repository "https://github.com/Firefishy/osm-imagery-hampshire-aerial-site.git"
 end
 
 imagery_layer "gb_hampshire_aerial_rgb" do

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index c234fa7a119e193c71afd3f4860fc0f764c0f2bd..40234e1639e62f43a0c28ca0b152e2eb8f0c18cc 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -42,6 +42,7 @@ end
 
 imagery_site "os.openstreetmap.org" do
   aliases ["os.openstreetmap.org.uk"]
+  git_repository "https://github.com/Firefishy/osm-imagery-os-site.git"
 end
 
 imagery_layer "gb_os_sv_2010_04" do

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index a9e5cd3f06db8eff065c3552da7c5d6d01dfb6cd..ff82958d2a7f084beccde51f90aec46fe7a219c3 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -21,6 +21,7 @@ include_recipe "imagery"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
   # aliases
+  git_repository "https://github.com/Firefishy/osm-imagery-surrey-aerial-site.git"
 end
 
 imagery_layer "gb_surrey_aerial" do

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 88b122097753bd5afe9e50b079a555eeeec1d76a..507293e549521a070cd9889f7f7bff7949d20442 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -21,12 +21,17 @@ default_action :create
 
 property :name, String
 property :aliases, [String, Array], :default => []
+property :git_repository, String, :default => ["https://github.com/Firefishy/osm-imagery-default.git"]
 
 action :create do
-  directory "/srv/#{name}" do
-    owner "root"
+  git "/srv/#{name}" do
+    action :sync
+    repository "#{git_repository}"
+    revision "master"
+    enable_submodules true
+    retries 3
+    user "root"
     group "root"
-    mode 0755
   end
 
   nginx_site name do