nominatim: switch off DB query logging

[chef.git] / cookbooks / apt / recipes / default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 705e72c8693da34d87b77d14f9bedfd75c7eabec..b1e5825ebf5e0cc26bfb7099092f5bbcc84c379b 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -29,34 +29,24 @@ execute "apt-update" do
   command "/usr/bin/apt-get update"
 end
 
+sources_template = case node[:lsb][:release].to_f
+  when 12.10 then "old-sources.list.erb"
+  else "sources.list.erb"
+end
+
 template "/etc/apt/sources.list" do
-  source "sources.list.erb"
+  source sources_template
   owner "root"
   group "root"
   mode 0644
   notifies :run, "execute[apt-update]"
 end
 
-apt_source "brightbox" do
-  url "http://apt.brightbox.net/"
-  key "0090DAAD"
-end
-
 apt_source "brightbox-ruby-ng" do
   url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu"
   key "C3173AA6"
 end
 
-apt_source "brightbox-ruby-ng-experimental" do
-  url "http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu-experimental"
-  key "C3173AA6"
-end
-
-apt_source "pitti-postgresql" do
-  url "http://ppa.launchpad.net/pitti/postgresql/ubuntu"
-  key "8683D8A2"
-end
-
 apt_source "ubuntugis-stable" do
   url "http://ppa.launchpad.net/ubuntugis/ppa/ubuntu"
   key "314DF160"
@@ -67,20 +57,12 @@ apt_source "ubuntugis-unstable" do
   key "314DF160"
 end
 
-apt_source "brianmercer-php" do
-  url "http://ppa.launchpad.net/brianmercer/php/ubuntu"
-  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 == 12.04 || node[:lsb][:release].to_f == 12.10
+  apt_source "openstreetmap" do
+    template "openstreetmap.list.erb"
+    url "http://ppa.launchpad.net/osmadmins/ppa/ubuntu"
+    key "0AC4F2CB"
+  end
 end
 
 apt_source "management-component-pack" do
@@ -111,3 +93,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