Permalink
Browse files

Merge pull request #4 from jefmathiot/master

Replaced cookbook file for APT sources with a template so that the recipe considers distro codename (Ubuntu)
  • Loading branch information...
2 parents d423b14 + 5a3e8d8 commit 7d9df0454e333398d9c9e96979d979ac3fb9306a @nathenharvey nathenharvey committed Aug 16, 2012
Showing with 4 additions and 3 deletions.
  1. +0 −2 files/default/percona_repo.list
  2. +2 −1 recipes/default.rb
  3. +2 −0 templates/default/percona_repo.list.erb
@@ -1,2 +0,0 @@
-deb http://repo.percona.com/apt lucid main
-deb-src http://repo.percona.com/apt lucid main
View
@@ -40,7 +40,8 @@
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A | gpg -a --export CD2EFD2A | apt-key add -; apt-get update"
end
- cookbook_file "/etc/apt/sources.list.d/percona_repo.list" do
+ template "/etc/apt/sources.list.d/percona_repo.list" do
+ source "percona_repo.list.erb"
owner "root"
group "root"
mode "0644"
@@ -0,0 +1,2 @@
+deb http://repo.percona.com/apt <%= node[:lsb][:codename] %> main
+deb-src http://repo.percona.com/apt <%= node[:lsb][:codename] %> main

0 comments on commit 7d9df04

Please sign in to comment.