X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e3e9c005f2054e595f3c735af096ceb5c3a1d785..79c6636acc892cc8fd336a0506948fcd16e8654f:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 84b03a0f0..c4cd3acc3 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -37,12 +37,6 @@ template "/etc/apt/sources.list" do notifies :run, "execute[apt-update]" end -apt_source "opscode" do - template "opscode.list.erb" - url "http://apt.opscode.com/" - key "83EF826A" -end - apt_source "brightbox" do url "http://apt.brightbox.net/" key "0090DAAD" @@ -78,15 +72,11 @@ apt_source "brianmercer-php" do key "8D0DC64F" end -apt_source "openstreetmap" do - url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu" - key "0AC4F2CB" -end - -apt_source "proliant-support-pack" do - template "hp.list.erb" - url "http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack" - key "2689B887" +if node[:lsb][:release].to_f < 14.04 + apt_source "openstreetmap" do + url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu" + key "0AC4F2CB" + end end apt_source "management-component-pack" do @@ -96,6 +86,7 @@ apt_source "management-component-pack" do end apt_source "hwraid" do + template "hwraid.list.erb" url "http://hwraid.le-vert.net/ubuntu" key "23B3D3B4" end @@ -116,3 +107,8 @@ apt_source "elasticsearch" do url "http://packages.elasticsearch.org/elasticsearch/1.0/debian" key "D88E42B4" end + +apt_source "passenger" do + url "https://oss-binaries.phusionpassenger.com/apt/passenger" + key "AC40B2F7" +end