Merge pull request heavywater#6 from InfoSpace/master

Old key urls no longer work
Karamorf · Jul 8, 2011 · 24a8048 · 24a8048
2 parents 9c60e07 + 01366b4
commit 24a8048
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -82,9 +82,10 @@
     package "openjdk-6-jre"
 
     package "psmisc"
+    key_url = "http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key"
 
     remote_file "#{tmp}/jenkins-ci.org.key" do
-      source "#{node[:jenkins][:mirror]}/debian/jenkins-ci.org.key"
+      source "#{key_url}"
     end
 
     execute "add-jenkins-key" do
@@ -119,14 +120,15 @@
 
 when "centos", "redhat"
   #see http://jenkins-ci.org/redhat/
+  key_url = "http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key"
 
   remote = "#{node[:jenkins][:mirror]}/latest/redhat/jenkins.rpm"
   package_provider = Chef::Provider::Package::Rpm
   pid_file = "/var/run/jenkins.pid"
   install_starts_service = false
 
   execute "add-jenkins-key" do
-    command "rpm --import #{node[:jenkins][:mirror]}/redhat/jenkins-ci.org.key"
+    command "rpm --import #{key_url}"
     action :nothing
   end