Use git-core PPA for git

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index fe79213c098dd166cd284a8ab6a71fad06794357..802ab186a35bac1a04dc227a5af0096bd4ade571 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -73,6 +73,11 @@ apt_repository "ubuntugis-unstable" do
   uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
+apt_repository "git-core" do
+  action repository_actions["git-core"]
+  uri "ppa:git-core/ppa"
+end
+
 apt_repository "maxmind" do
   action repository_actions["maxmind"]
   uri "ppa:maxmind/ppa"

diff --git a/cookbooks/git/attributes/default.rb b/cookbooks/git/attributes/default.rb
index fd641f37a5b3472ec441a8acdde217a552883f14..7a4209f5d007809dec252284416562da0d31f01f 100644 (file)
--- a/cookbooks/git/attributes/default.rb
+++ b/cookbooks/git/attributes/default.rb
@@ -5,3 +5,5 @@ default[:git][:public_group] = "git"
 default[:git][:private_user] = "git"
 default[:git][:private_group] = "git"
 default[:git][:private_nodes] = "fqdn:*"
+
+default[:apt][:sources] |= ["git-core"]

diff --git a/cookbooks/git/metadata.rb b/cookbooks/git/metadata.rb
index 19f53944f1871e1d42bc67489f17839eddd720e3..b86267bd2112d62a16c4a34db405c3cfc7aa4726 100644 (file)
--- a/cookbooks/git/metadata.rb
+++ b/cookbooks/git/metadata.rb
@@ -8,4 +8,5 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
+depends           "apt"
 depends           "networking"

diff --git a/cookbooks/git/recipes/default.rb b/cookbooks/git/recipes/default.rb
index 3f93f651ccd8e04d0ddb7e5e83b2430ed414b746..49d43ae8225b62b2168fbd502cf4bf3ec34ea6c3 100644 (file)
--- a/cookbooks/git/recipes/default.rb
+++ b/cookbooks/git/recipes/default.rb
@@ -17,4 +17,6 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+
 package "git"